From 84643dd6d711b89aab1ccf48c20f1278c6a1fb91 Mon Sep 17 00:00:00 2001 From: Etoh Date: Tue, 26 Dec 2017 12:52:47 +0000 Subject: [PATCH] Fix rebase to Syncplay 1.5.0 --- syncplay/ui/GuiConfiguration.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index c20ea34..5cc0d4e 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -12,7 +12,7 @@ import sys import threading from syncplay.messages import getMessage, getLanguages, setLanguage, getInitialLanguage from syncplay import constants -from syncplay.utils import isBSD, isLinux, isMacOS +from syncplay.utils import isBSD, isLinux, isMacOS, isWindows from syncplay.utils import resourcespath, posixresourcespath class GuiConfiguration: def __init__(self, config, error=None, defaultConfig=None): @@ -1254,6 +1254,12 @@ class ConfigDialog(QtWidgets.QDialog): self.QtWidgets = QtWidgets self.QtGui = QtGui self.error = error + if isWindows(): + resourcespath = utils.findWorkingDir() + "\\resources\\" + else: + resourcespath = utils.findWorkingDir() + u"/resources/" + self.posixresourcespath = utils.findWorkingDir().replace(u"\\","/") + u"/resources/" + self.resourcespath = resourcespath super(ConfigDialog, self).__init__()