summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-10-06 02:10:00 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-10-06 02:10:00 +0200
commit1f66265ba2e6c306ba6d3641b0b78eefa5e6d1a3 (patch)
treeee3493e0ce6012699a79a4b4fe0f81fa274ae2a2 /facetracknoir
parent5be19a838f8c058b6a4ed90a2e2b3da6b9a3dcbc (diff)
parentb71978bfb292f31673754fdb6997c0250e0cc361 (diff)
Merge branch 'unstable' into trackhat-ui
* unstable: process-detector: check when cancel button is pressed
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/process_detector.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/facetracknoir/process_detector.cpp b/facetracknoir/process_detector.cpp
index 19611241..59a40f03 100644
--- a/facetracknoir/process_detector.cpp
+++ b/facetracknoir/process_detector.cpp
@@ -67,7 +67,8 @@ void BrowseButton::browse()
tr("Executable (*.exe);;All Files (*)"));
MainWindow::set_working_directory();
filename = QFileInfo(filename).fileName();
- twi->setText(filename);
+ if (!filename.isNull())
+ twi->setText(filename);
}
int process_detector::add_row(QString exe_name, QString profile)