diff options
author | root <root@rshg054.dnsready.net> | 2012-07-06 00:01:51 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-07-06 00:01:51 +0000 |
commit | 810a5a6e8edafe2550300c5030083669db6e3973 (patch) | |
tree | 67bce9a7079962a26b9f1d156941e8e4a3cda92c /community/vidalia/bug6178.patch | |
parent | 7f6f69dc52c8601768ba48fa7b69507a80d532cb (diff) |
Fri Jul 6 00:01:50 UTC 2012
Diffstat (limited to 'community/vidalia/bug6178.patch')
-rw-r--r-- | community/vidalia/bug6178.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch new file mode 100644 index 000000000..5da41ef55 --- /dev/null +++ b/community/vidalia/bug6178.patch @@ -0,0 +1,28 @@ +From: Tomás Touceda <chiiph@torproject.org> +Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300) +Subject: Do not add relative root to datadirectory if it is empty +X-Git-Url: https://gitweb.torproject.org + +Do not add relative root to datadirectory if it is empty +--- + +diff --git a/changes/bug6178 b/changes/bug6178 +new file mode 100644 +index 0000000..e727ed9 +--- /dev/null ++++ b/changes/bug6178 +@@ -0,0 +1 @@ ++ o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178. +diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp +index a8dce5a..a7a4a09 100644 +--- a/src/vidalia/MainWindow.cpp ++++ b/src/vidalia/MainWindow.cpp +@@ -1104,7 +1104,7 @@ MainWindow::start() + QString dataDirectory = settings.getDataDirectory(); + QFileInfo dataDirectoryInfo(dataDirectory); + +- if(QDir(dataDirectory).isRelative()) { ++ if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) { + dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; + + QFileInfo newDataDirectoryInfo(dataDirectory); |