Changeset 152:f0701a18628a for src/mlx/gui

Timestamp:

05/05/12 11:40:28 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Made the sending of the closing message more reliable

File:

• src/mlx/gui/gui.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -399 +399 @@
         self._logView.get_buffer().set_text("")
 
-    def _disconnect(self):
+    def _disconnect(self, closingMessage = None, duration = 3):
         """Disconnect from the simulator if connected."""
         self.stopMonitoring()
 
         if self._connected:
-            self._flight.simulator.disconnect()
+            if closingMessage is None:
+                self._flight.simulator.disconnect()
+            else:
+                fs.sendMessage(const.MESSAGETYPE_ENVIRONMENT,
+                               closingMessage, duration,
+                               disconnect = True)
             self._connected = False
 
@@ -455 +460 @@
         self._wizard.setStage(stage)
         if stage==const.STAGE_END:
-            # FIXME: perhaps a more elegant method, e.g.
-            # the simulator should provide a function disconnect
-            # with a final message
-            gobject.timeout_add(1000, self._disconnect)
+            self._disconnect(closingMessage =
+                             "Flight plan closed. Welcome to %s" % \
+                             (self.bookedFlight.arrivalICAO,),
+                             duration = 5)
 
     def setRating(self, rating):