Merge branch 'master' of git:https://github.com/cream/melange

cream · May 8, 2011 · f6d6b52 · f6d6b52
2 parents 0a9f556 + 3ab0d30
commit f6d6b52
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/configuration/scheme.xml b/src/configuration/scheme.xml
@@ -3,7 +3,7 @@
         <item type="dict">
             <y type="int">20</y>
             <x type="int">0</x>
-            <name type="str">Control Area</name>
+            <name type="str">Melange Tips</name>
         </item>
     </widgets>
     <hotkey action="toggle-overlay" type="hotkey" label="Hotkey toggling the overlay mode">F12</hotkey>

diff --git a/src/melange.py b/src/melange.py
@@ -578,6 +578,9 @@ def fade_in(t, state):
     def quit(self):
         """ Quit the module. """
 
+        for widget in self.widgets.values():
+            widget.config.save()
+
         self.config.widgets = self.widgets.values()
         cream.Module.quit(self)
 

diff --git a/src/melange/hotkeys.py b/src/melange/hotkeys.py
@@ -48,8 +48,10 @@ def __init__(self, hotkeys):
 
 
     def _ooxcb_callback(self, source, condition):
-
-        reply = self.cookie.reply()
+        try:
+            reply = self.cookie.reply()
+        except ctypes.ArgumentError:
+            return True
         if reply is not None and reply.category == record.Category.FromServer:
             opcode = reply.data[0]
             event_type = self.connection.events[opcode]