i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed a crash because of a call to get_menu_info in init_interface_kit()

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6118 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2004-01-17 17:28:08 +00:00
parent 147fecb0db
commit 75d4185679
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/app/Application.cpp
+10 -5
View File
@@ -60,7 +60,6 @@
// Local Includes --------------------------------------------------------------
// Local Defines ---------------------------------------------------------------
#define RUN_WITHOUT_REGISTRAR
// Globals ---------------------------------------------------------------------
BApplication* be_app = NULL;
@@ -773,21 +772,27 @@ void BApplication::InitData(const char* signature, status_t* error)
}
#endif // ifdef RUN_WITHOUT_REGISTRAR
// TODO: Not sure about the order
// TODO: Not completely sure about the order, but this should be close.
// An app_server connection is necessary for a lot of stuff, so get that first.
if (fInitError == B_OK)
connect_to_app_server();
if (fInitError == B_OK)
setup_server_heaps();
if (fInitError == B_OK)
get_scs();
if (fInitError == B_OK)
fInitError = _init_interface_kit_();
// init be_app and be_app_messenger
if (fInitError == B_OK) {
be_app = this;
be_app_messenger = BMessenger(NULL, this);
}
// Initialize the IK after we have set be_app because of a construction of a
// BAppServerLink (which depends on be_app) nested inside the call to get_menu_info.
if (fInitError == B_OK)
fInitError = _init_interface_kit_();
// set the BHandler's name
if (fInitError == B_OK)
SetName(ref.name);