diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-05 01:15:32 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-05 01:15:32 (GMT) |
| commit | c5f792e99203a531870287b1c4a0df73b9294bbf (patch) | |
| tree | 5ff583e6ab8722e8e60071a10ad0f2c326001503 | |
| parent | 3e024822e6820bf29cdf555cfac180880d6fc962 (diff) | |
| parent | 7863de2c808c91b748a137c240ea2aac9c813e29 (diff) | |
Merge branch 'master' into issue181
| -rw-r--r-- | scripts/installer.nsi | 1 | ||||
| -rw-r--r-- | src/mainwin.cc | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 2cbd6d3..9d7d891 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -30,5 +30,6 @@ Delete $INSTDIR\libraries\boxes.scad Delete $INSTDIR\libraries\shapes.scad RMDir $INSTDIR\libraries Delete $INSTDIR\openscad.exe +Delete $INSTDIR\openscad.com RMDir $INSTDIR SectionEnd diff --git a/src/mainwin.cc b/src/mainwin.cc index 7cebd7e..febb325 100644 --- a/src/mainwin.cc +++ b/src/mainwin.cc @@ -499,12 +499,12 @@ void MainWindow::openFile(const QString &new_filename) { QString actual_filename = new_filename; + QFileInfo fi(new_filename); + if (fi.suffix().toLower().contains(QRegExp("^(stl|off|dxf)$"))) { + actual_filename = QString(); + } #ifdef ENABLE_MDI if (!editor->toPlainText().isEmpty()) { - QFileInfo fi(new_filename); - if (fi.suffix().toLower().contains(QRegExp("^(stl|off|dxf)$"))) { - actual_filename = QString(); - } new MainWindow(actual_filename); clearCurrentOutput(); return; |