about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Jastrzębski <pawelj@vulturis.eu>2013-10-09 13:53:03 +0200
committerPaweł Jastrzębski <pawelj@vulturis.eu>2013-10-09 13:53:03 +0200
commit82445d5d3a0a11d8220315f3fbb8a02c63c0a49a (patch)
tree8f3714a45953f634bf4143c9162a74d76c087cb2
parentAdded support for file association (diff)
downloadkcc-82445d5d3a0a11d8220315f3fbb8a02c63c0a49a.tar.gz
kcc-82445d5d3a0a11d8220315f3fbb8a02c63c0a49a.tar.bz2
kcc-82445d5d3a0a11d8220315f3fbb8a02c63c0a49a.zip
File association: Socket encoding fix
-rw-r--r--kcc.py2
-rw-r--r--kcc/KCC_gui.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/kcc.py b/kcc.py
index 0b3f966..9b4916d 100644
--- a/kcc.py
+++ b/kcc.py
@@ -71,7 +71,7 @@ class QApplicationMessaging(QtGui.QApplication):
     def handleMessage(self):
         socket = self._server.nextPendingConnection()
         if socket.waitForReadyRead(self._timeout):
-            self.emit(QtCore.SIGNAL('messageFromOtherInstance'), socket.readAll().data())
+            self.emit(QtCore.SIGNAL('messageFromOtherInstance'), socket.readAll().data().decode('utf8'))
 
     def sendMessage(self, message):
         if self.isRunning():
diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py
index 568292b..ffdda89 100644
--- a/kcc/KCC_gui.py
+++ b/kcc/KCC_gui.py
@@ -631,6 +631,7 @@ class Ui_KCC(object):
 
     def handleMessage(self, message):
         MainWindow.raise_()
+        MainWindow.activateWindow()
         if not self.conversionAlive:
             if self.needClean:
                 self.needClean = False