vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix "New" button in launching screen. 

The "New" button will cause the launching screen to return with an empty
selection of files. In this case, the dummy file name "" needs to remain
in the file list to allow the main window to open.
master
Torsten Paul 2015-03-01 00:55:59 +01:00
parent 94d609addb
commit 0bbe4ea43e
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/launchingscreen.cc
View File

@ -14,6 +14,8 @@ LaunchingScreen *LaunchingScreen::getDialog() {
return LaunchingScreen::inst;
}
// Called (possibly multiple times) by EventFilter on MacOS, e.g.
// when the user opens files from Finder.
void LaunchingScreen::openFile(const QString &filename)
{
QVariant v(filename);

10
src/openscad.cc
View File

@ -706,10 +706,14 @@ int gui(vector<string> &inputFiles, const fs::path &original_path, int argc, cha
LaunchingScreen *launcher = new LaunchingScreen();
int dialogResult = launcher->exec();
if (dialogResult == QDialog::Accepted) {
inputFiles.clear();
QStringList files = launcher->selectedFiles();
BOOST_FOREACH(const QString &f, files) {
inputFiles.push_back(f.toStdString());
// If nothing is selected in the launching screen, leave
// the "" dummy in inputFiles to open an empty MainWindow.
if (!files.empty()) {
inputFiles.clear();
BOOST_FOREACH(const QString &f, files) {
inputFiles.push_back(f.toStdString());
}
}
delete launcher;
} else {