3 files changed, 18 insertions, 16 deletions

diff --git a/src/GuiLua/GuiLua.c b/src/GuiLua/GuiLua.c
index 65e0d79..f2de1ea 100644
--- a/src/GuiLua/GuiLua.c
+++ b/src/GuiLua/GuiLua.c
@@ -429,7 +429,7 @@ GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world)
   return result;
 }
 
-GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world)
+GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world)
 {
   GuiLua *result;
   char *args[] = {"GuiLUa", "-l", ""};
@@ -437,6 +437,7 @@ GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world)
   args[2] = module;
   result = GuiLuaDo(3, args, parent, world);
   result->name = module;
+  result->server = server;
   return result;
 }
 
diff --git a/src/GuiLua/GuiLua.h b/src/GuiLua/GuiLua.h
index 9ee5a1f..cf94e1f 100644
--- a/src/GuiLua/GuiLua.h
+++ b/src/GuiLua/GuiLua.h
@@ -22,6 +22,7 @@ typedef struct _GuiLua
   winFang       *us;            // Our window, if it exists.
   winFang       *parent;        // Our parent window, if it exists.
   EPhysics_World *world;        // Our world, if it exists.
+  Ecore_Con_Server      *server;
   int           inDel;
 
   Eina_Clist    node;
@@ -32,7 +33,7 @@ typedef struct _GuiLua
 extern const char       *glName;
 
 GuiLua *GuiLuaDo(int argc, char **argv, winFang *parent, EPhysics_World *world);
-GuiLua *GuiLuaLoad(char *module, winFang *parent, EPhysics_World *world);
+GuiLua *GuiLuaLoad(char *module, winFang *parent, Ecore_Con_Server *server, EPhysics_World *world);
 void GuiLuaDel(GuiLua *gl);
 
 #endif
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 6c68bd2..5122f42 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -652,18 +652,6 @@ EAPI_MAIN int elm_main(int argc, char **argv)
 
   ourGlobals.world = ephysicsAdd(&ourGlobals);
 
-//  overlay_add(&ourGlobals);
-  GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world);
-  woMan_add(&ourGlobals);
-  ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.world);
-  ourGlobals.purkle     = GuiLuaLoad("purkle",     ourGlobals.mainWindow, ourGlobals.world);
-  ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
-
-   // Bump the top toolbar above the windows.
-  evas_object_raise(ourGlobals.tb);
-
-  _on_resize(&ourGlobals, NULL, NULL, NULL);
-
   // Try to connect to the love server we started before.
   ourGlobals.address = "127.0.0.1";
   ourGlobals.port = 8211;
@@ -678,16 +666,28 @@ EAPI_MAIN int elm_main(int argc, char **argv)
   else
     PC("Failed to connect to server!");
 
+//  overlay_add(&ourGlobals);
+//  GuiLuaLoad("test", ourGlobals.mainWindow, ourGlobals.world);
+  woMan_add(&ourGlobals);
+  ourGlobals.LSLGuiMess = GuiLuaLoad("LSLGuiMess", ourGlobals.mainWindow, ourGlobals.server, ourGlobals.world);
+  ourGlobals.purkle     = GuiLuaLoad("purkle",     ourGlobals.mainWindow, ourGlobals.server, ourGlobals.world);
+  ourGlobals.files = filesAdd(&ourGlobals, (char *) elm_app_data_dir_get(), EINA_TRUE, EINA_FALSE);
+
+   // Bump the top toolbar above the windows.
+  evas_object_raise(ourGlobals.tb);
+
+  _on_resize(&ourGlobals, NULL, NULL, NULL);
+
   // Setup our callback for clicking in world.
   ourGlobals.scene->clickCb = _onWorldClick;
 
   elm_run();
 
-  if (ourGlobals.server)  ecore_con_server_del(ourGlobals.server);
-
   ephysics_world_del(ourGlobals.world);
   ephysics_shutdown();
 
+  if (ourGlobals.server)  ecore_con_server_del(ourGlobals.server);
+
   if (ourGlobals.win)
   {
     Evas_3D_Demo_fini(&ourGlobals);