[tor-commits] [vidalia/master] Do not add relative root to datadirectory if it is empty

[chiiph at torproject.org]

commit 6caa1715aee5395f77a0c631fc38553a5e483ecf
Author: Tomás Touceda <chiiph at torproject.org>
Date:   Thu Jun 28 20:55:24 2012 -0300

    Do not add relative root to datadirectory if it is empty
---
 changes/bug6178            |    1 +
 src/vidalia/MainWindow.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

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);