Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Moved loading roster settings to the point after it has been added to the

Browse Source 
registrar.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34077 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-11-16 18:13:27 +00:00
parent 7162a69600
commit 88b38f2901
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/servers/registrar/TRoster.cpp
View File

@ -141,7 +141,6 @@ TRoster::TRoster()
fLastToken(0),
fShuttingDown(false)
{
_LoadRosterSettings();
}
@ -1189,21 +1188,18 @@ TRoster::ClearRecentApps()
status_t
TRoster::Init()
{
status_t error = B_OK;
// check lock initialization
if (fLock.Sem() < 0)
return fLock.Sem();
// create the info
RosterAppInfo* info = new(nothrow) RosterAppInfo;
if (!info)
error = B_NO_MEMORY;
if (info == NULL)
return B_NO_MEMORY;
// get the app's ref
entry_ref ref;
if (error == B_OK)
error = get_app_ref(&ref);
status_t error = get_app_ref(&ref);
// init and add the info
if (error == B_OK) {
@ -1215,8 +1211,11 @@ TRoster::Init()
error = AddApp(info);
}
if (error == B_OK)
_LoadRosterSettings();
// cleanup on error
if (error != B_OK && info)
if (error != B_OK)
delete info;
return error;