Some initialization steps can remain outside the if (!initialized) block.

1 files changed, 19 insertions, 17 deletions

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 814ce54..3d06691 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -396,32 +396,34 @@ TkpInit(
 	    }
 	}
 
-        if (tkLibPath[0] != '\0') {
-	    Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY);
-        }
-
-        if (scriptPath[0] != '\0') {
-	    Tcl_SetVar2(interp, "auto_path", NULL, scriptPath,
-    		TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
-	}
-
-        Tcl_CreateObjCommand(interp, "::tk::mac::standardAboutPanel",
-	    TkMacOSXStandardAboutPanelObjCmd, NULL, NULL);
-        Tcl_CreateObjCommand(interp, "::tk::mac::registerServiceWidget",
-	    TkMacOSXRegisterServiceWidgetObjCmd, NULL, NULL);
-        Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap",
-	    TkMacOSXIconBitmapObjCmd, NULL, NULL);
-        Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath", TkMacOSXGetAppPath, NULL, NULL);
 
 	/*
 	 * Initialize the NSServices object here. Apple's docs say to do this
 	 * in applicationDidFinishLaunching, but the Tcl interpreter is not
-	 * initialized until this function call.
+	 * initialized until this function call.  Only the main interpreter
+	 * is allowed to provide services.
 	 */
 
+	Tcl_CreateObjCommand(interp, "::tk::mac::registerServiceWidget",
+	    TkMacOSXRegisterServiceWidgetObjCmd, NULL, NULL);
 	TkMacOSXServices_Init(interp);
     }
 
+    if (tkLibPath[0] != '\0') {
+	Tcl_SetVar2(interp, "tk_library", NULL, tkLibPath, TCL_GLOBAL_ONLY);
+    }
+
+    if (scriptPath[0] != '\0') {
+	Tcl_SetVar2(interp, "auto_path", NULL, scriptPath,
+		TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
+    }
+
+    Tcl_CreateObjCommand(interp, "::tk::mac::standardAboutPanel",
+	    TkMacOSXStandardAboutPanelObjCmd, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::mac::iconBitmap",
+	    TkMacOSXIconBitmapObjCmd, NULL, NULL);
+    Tcl_CreateObjCommand(interp, "::tk::mac::GetAppPath", TkMacOSXGetAppPath, NULL, NULL);
+
     return TCL_OK;
 }