Merge branch 'release-0.3.4'

1 files changed, 15 insertions, 1 deletions

diff --git a/src/leap/bitmask/gui/statemachines.py b/src/leap/bitmask/gui/statemachines.py
index c3dd5ed3..94726720 100644
--- a/src/leap/bitmask/gui/statemachines.py
+++ b/src/leap/bitmask/gui/statemachines.py
@@ -128,11 +128,25 @@ class ConnectionMachineBuilder(object):
             states[_OFF])
 
         # * If we receive the connection_died, we transition
-        #   to the off state
+        #   from on directly to the off state
         states[_ON].addTransition(
             conn.qtsigs.connection_died_signal,
             states[_OFF])
 
+        # * If we receive the connection_aborted, we transition
+        #   from connecting to the off state
+        states[_CON].addTransition(
+            conn.qtsigs.connection_aborted_signal,
+            states[_OFF])
+        # * Connection died can in some cases also be
+        #   triggered while we are in CONNECTING
+        #   state. I should be avoided, since connection_aborted
+        #   is clearer (and reserve connection_died
+        #   for transitions from on->off
+        states[_CON].addTransition(
+            conn.qtsigs.connection_died_signal,
+            states[_OFF])
+
         # adding states to the machine
         for state in states.itervalues():
             machine.addState(state)