 +		gui.vimWindow->Unlock();
 +}
 +
-+#define RUN_BAPPLICATION_IN_NEW_THREAD	1
++#define RUN_BAPPLICATION_IN_NEW_THREAD	0
 +
 +#if RUN_BAPPLICATION_IN_NEW_THREAD
 +

 	    set_x11_title(title);		/* x11 */
 #endif
-#if defined(FEAT_GUI_GTK) \
+#if defined(FEAT_GUI_GTK) || defined(__HAIKU__)\
 	|| defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC)
 	else
 	    gui_mch_settitle(title, icon);

 # define MAY_FORK
     int		dofork = TRUE;
 #endif
@@ -1297,7 +1297,11 @@
 again:
     busy = TRUE;
