Fix #22: crash if exitting the ConnectionDialog without selecting a s…

…erver

src/cocomud.py

@@ -49,10 +49,11 @@
 # Create the client and ClientWindow
 window = ClientWindow(engine)
 world = window.world
-hostname = window.panel.world.hostname
-port = window.panel.world.port
-client = engine.open(hostname, port, world)
-client.link_window(window)
-world.load()
-client.start()
-app.MainLoop()
+if world is not None:
+    hostname = window.panel.world.hostname
+    port = window.panel.world.port
+    client = engine.open(hostname, port, world)
+    client.link_window(window)
+    world.load()
+    client.start()
+    app.MainLoop()

src/ui/window.py

@@ -48,6 +48,7 @@ class ClientWindow(DummyUpdater):
 
     def __init__(self, engine, world=None):
         super(ClientWindow, self).__init__(None)
+        self.panel = None
         self.engine = engine
         self.focus = True
         self.interrupt = False
@@ -120,6 +121,10 @@ def InitUI(self, world=None):
             dialog.ShowModal()
             world = self.engine.default_world
 
+        if world is None:
+            self.Destroy()
+            return
+
         self.panel = MUDPanel(self, self.engine, world)
         self.SetTitle("{} [CocoMUD]".format(world.name))
         self.Maximize()

src/version.py

@@ -1 +1 @@
-BUILD = 16
+BUILD = 17