fix crash

frescobaldi · Dec 2, 2011 · 3d9453b · 3d9453b
1 parent b60959d
commit 3d9453b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,8 @@ Changes in 1.9.4 --
 * Updated translations: es, fr, nl
 * New features:
   - Engrave custom dialog for specifying other engraving formats and options
+* Bugfixes:
+  - fix crash on 64bit Linux and Windows introduced in 1.9.3
 
 
 Changes in 1.9.3 -- December 1st, 2011

diff --git a/frescobaldi_app/widgets/drag.py b/frescobaldi_app/widgets/drag.py
@@ -46,12 +46,11 @@ def __init__(self, combobox):
         combobox.installEventFilter(self)
 
     def eventFilter(self, combobox, ev):
-        if combobox.count() == 0:
-            return False
         if ev.type() == QEvent.MouseButtonPress and ev.button() == Qt.LeftButton:
             self._dragpos = ev.pos()
             return not combobox.isEditable()
-        elif ev.type() == QEvent.MouseMove and ev.buttons() & Qt.LeftButton:
+        elif (ev.type() == QEvent.MouseMove and ev.buttons() & Qt.LeftButton
+              and combobox.count() >0):
             return self.mouseMoved(combobox, ev.pos()) or False
         elif (ev.type() == QEvent.MouseButtonRelease
             and ev.button() == Qt.LeftButton and not combobox.isEditable()):