[rkward-cvs] rkward/rkward rkward.cpp,1.115,1.116

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27998

Modified Files:
	rkward.cpp 
Log Message:
Fix race condition in initialization

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** rkward.cpp	24 Oct 2005 18:11:57 -0000	1.115
--- rkward.cpp	26 Oct 2005 18:38:08 -0000	1.116
***************
*** 161,171 ****
  	object_browser = new RObjectBrowser ();
  
  	startR ();
! 	
  	QString dummy = i18n ("Please note that RKWard is still far from being finished. We feel it is already helpful for a number of tasks, but many features are lacking or buggy. You can help us by filing bug reports, feature requests, or providing feedback in any other form. Please visit http://rkward.sourceforge.net for contact information.");
  	KMessageBox::information (this, dummy, i18n("What to expect of RKWard"), "state_of_rkward");
  	
  	initPlugins ();
! 	
  	//It's necessary to give a different name to all tool windows, or they won't be properly displayed
  	object_browser->setName("workspace"); 
--- 161,174 ----
  	object_browser = new RObjectBrowser ();
  
+ 	RControlWindowPart *rcpart = new RControlWindowPart ();		// the control window needs to be initialized before startR () is called.
+ 	RKGlobals::rcontrol = static_cast<RControlWindow *> (rcpart->widget ());
+ 
  	startR ();
! 
  	QString dummy = i18n ("Please note that RKWard is still far from being finished. We feel it is already helpful for a number of tasks, but many features are lacking or buggy. You can help us by filing bug reports, feature requests, or providing feedback in any other form. Please visit http://rkward.sourceforge.net for contact information.");
  	KMessageBox::information (this, dummy, i18n("What to expect of RKWard"), "state_of_rkward");
  	
  	initPlugins ();
! 
  	//It's necessary to give a different name to all tool windows, or they won't be properly displayed
  	object_browser->setName("workspace"); 
***************
*** 178,183 ****
  	connect (RKGlobals::rInterface ()->watch, SIGNAL (raiseWatch ()), this, SLOT (raiseWatch ()));
  
- 	RControlWindowPart *rcpart = new RControlWindowPart ();
- 	RKGlobals::rcontrol = static_cast<RControlWindow *> (rcpart->widget ());
  	RKGlobals::rcontrol->setCaption (i18n ("Command Stack"));
  	RKGlobals::rcontrol->setName ("rcontrol");
--- 181,184 ----