From 7d8883fd115518e7055add74fa4a03199893cdd0 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 9 May 2014 09:12:32 +0200 Subject: [PATCH] Use QCoreApplication::applicationName in get_standard_dir --- qutebrowser/utils/misc.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qutebrowser/utils/misc.py b/qutebrowser/utils/misc.py index 83e90f03c..b06bf23d9 100644 --- a/qutebrowser/utils/misc.py +++ b/qutebrowser/utils/misc.py @@ -27,7 +27,7 @@ from urllib.parse import urljoin, urlencode from functools import reduce from pkg_resources import resource_string -from PyQt5.QtCore import QStandardPaths +from PyQt5.QtCore import QCoreApplication, QStandardPaths import qutebrowser @@ -148,10 +148,11 @@ def get_standard_dir(typ): """ # FIXME we could easily add some unittests for this path = QStandardPaths.writableLocation(typ) + appname = QCoreApplication.instance().applicationName() if (typ == QStandardPaths.ConfigLocation and - os.path.split(path)[-1] != 'qutebrowser'): + os.path.split(path)[-1] != appname): # Workaround for https://bugreports.qt-project.org/browse/QTBUG-38872 - path = os.path.join(path, 'qutebrowser') + path = os.path.join(path, appname) if not os.path.exists(path): os.makedirs(path) return path