Merge remote-tracking branch 'origin/master'

fbaguelin · fbaguelin · commit d1b877326a47 · 2013-01-16T14:43:37.000+01:00
diff --git a/viewer/hexedit/search.py b/viewer/hexedit/search.py
@@ -197,9 +197,9 @@ def searchit(self):
                 opt_fromcursor = self.fromcursor.isChecked()
                 spinstart = self.start.value()
                 wild = self.wildcard.text()
-
+                # XXX 
                 if opt_fromcursor:
-                    start = self.heditor.currentSelection
+                    start = self.heditor.selection.offset
                 elif spinstart > 0:
                     start = spinstart
                 else:
