Merge pull request #8 from celil-kj/master
authorWladimir J. van der Laan <laanwj@gmail.com>
Fri, 15 Jul 2011 08:30:54 +0000 (01:30 -0700)
committerWladimir J. van der Laan <laanwj@gmail.com>
Fri, 15 Jul 2011 08:30:54 +0000 (01:30 -0700)
fix error when cancelling export

src/qt/addressbookpage.cpp
src/qt/transactionview.cpp

index 4f629fc..063e510 100644 (file)
@@ -187,6 +187,8 @@ void AddressBookPage::exportClicked()
             QDir::currentPath(),
             tr("Comma separated file (*.csv)"));
 
+    if (filename.isNull()) return;
+
     CSVModelWriter writer(filename);
 
     // name, column, role
index 03df422..8aa4339 100644 (file)
@@ -242,6 +242,8 @@ void TransactionView::exportClicked()
             QDir::currentPath(),
             tr("Comma separated file (*.csv)"));
 
+    if (filename.isNull()) return;
+
     CSVModelWriter writer(filename);
 
     // name, column, role