diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
| commit | 159dbe295148975bdfe9a50f871254aa9adf2328 (patch) | |
| tree | 5b679b7f617c4bc09c25a4c369e77156f0ff3e2c /src/leap/bitmask/gui/statemachines.py | |
| parent | 7858d83af4a09ab00f6ba33dd8dbcf07ade101ce (diff) | |
| parent | 312746bc9b77f0f738ccf2192d81ab94fdf9d6ba (diff) | |
Merge branch 'release-0.6.0'0.6.0
Diffstat (limited to 'src/leap/bitmask/gui/statemachines.py')
| -rw-r--r-- | src/leap/bitmask/gui/statemachines.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/statemachines.py b/src/leap/bitmask/gui/statemachines.py index 00a1387e..91f1f605 100644 --- a/src/leap/bitmask/gui/statemachines.py +++ b/src/leap/bitmask/gui/statemachines.py @@ -240,9 +240,9 @@ class CompositeMachine(QStateMachine): c2.qtsigs.disconnected_signal.connect(self.off_ev2_slot) # XXX why is this getting deletec in c++? - #Traceback (most recent call last): - #self.postEvent(self.events.on_ev2) - #RuntimeError: Internal C++ object (ConnectedEvent2) already deleted. + # Traceback (most recent call last): + # self.postEvent(self.events.on_ev2) + # RuntimeError: Internal C++ object (ConnectedEvent2) already deleted. # XXX trying the following workaround, since # I cannot find why in the world this is getting deleted :( # XXX refactor! @@ -318,9 +318,8 @@ class ConnectionMachineBuilder(object): components = self._conn.components if components is None: - # simple case: connection definition inherits directly from - # the abstract connection. - + # simple case: connection definition inherits directly from + # the abstract connection. leap_assert_type(self._conn, connections.AbstractLEAPConnection) return self._make_simple_machine(self._conn, **kwargs) |