From 491e5d73c30648e42174a95413e685b2138ecf56 Mon Sep 17 00:00:00 2001 From: Kiooeht Date: Tue, 16 Aug 2011 00:56:54 -0700 Subject: [PATCH] Bug fix: Logviewer got broke by ostools --- logviewer.py | 3 ++- pesterchum.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/logviewer.py b/logviewer.py index 91896d7..3fe358a 100644 --- a/logviewer.py +++ b/logviewer.py @@ -8,6 +8,8 @@ from generic import RightClickList, RightClickTree from parsetools import convertTags from convo import PesterText +_datadir = ostools.getDataDir() + class PesterLogSearchInput(QtGui.QLineEdit): def __init__(self, theme, parent=None): QtGui.QLineEdit.__init__(self, parent) @@ -124,7 +126,6 @@ class PesterLogUserSelect(QtGui.QDialog): @QtCore.pyqtSlot() def openDir(self): if ostools.isOSX(): - _datadir = ostools.getDataDir() QtGui.QDesktopServices.openUrl(QtCore.QUrl("file:///" + os.path.join(_datadir, "logs"), QtCore.QUrl.TolerantMode)) else: QtGui.QDesktopServices.openUrl(QtCore.QUrl("file:///" + os.path.join(os.getcwd(), "logs"), QtCore.QUrl.TolerantMode)) diff --git a/pesterchum.py b/pesterchum.py index 29ab19e..833585d 100644 --- a/pesterchum.py +++ b/pesterchum.py @@ -51,7 +51,7 @@ if not ((major > 4) or (major == 4 and minor >= 6)): _datadir = ostools.getDataDir() # See, what I've done here is that _datadir is '' if we're not on OSX, so the # concatination is the same as if it wasn't there. -if not os.path.exists(_datadir): +if _datadir and not os.path.exists(_datadir): os.mkdir(_datadir) if not os.path.exists(_datadir+"profiles"): os.mkdir(_datadir+"profiles")