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

BServer now remembers whether the GUI context has already been initialized, so that InitGUIContext() can be invoked twice without harm.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13415 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-07-03 16:55:27 +00:00
parent a60ea28262
commit 9fac7d6cfc
2 changed files with 14 additions and 4 deletions
headers/private/app
Server.h
src/kits/app
Server.cpp

5
headers/private/app/Server.h

@ -12,9 +12,12 @@
class BServer : public BApplication {
public:
BServer(const char* signature, bool initGUI, status_t* error);
BServer(const char* signature, bool initGUI, status_t *error);
status_t InitGUIContext();
private:
bool fGUIContextInitialized;
};
#endif // _SERVER_H

13
src/kits/app/Server.cpp

@ -9,14 +9,21 @@
#include <Server.h>
// constructor
BServer::BServer(const char* signature, bool initGUI, status_t* error)
: BApplication(signature, initGUI, error)
BServer::BServer(const char* signature, bool initGUI, status_t *error)
: BApplication(signature, initGUI, error),
fGUIContextInitialized(false)
{
fGUIContextInitialized = (initGUI && (!error || *error == B_OK));
}
// InitGUIContext
status_t
BServer::InitGUIContext()
{
return _InitGUIContext();
if (fGUIContextInitialized)
return B_OK;
status_t error = _InitGUIContext();
fGUIContextInitialized = (error == B_OK);
return error;
}