ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-19 10:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't show the "Load Options" dialog when choosing "Don't open any file" (#800)

Browse Source 
* Don't show the "Load Options" dialog when choosing "Don't open any file" #712

* Load option only if skipOptionsDialog flag isn't set
This commit is contained in:
NieGrzegorz 2018-10-11 15:04:57 +02:00 committed by Itay Cohen
parent 7c37d3413f
commit ac4beedbd7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/MainWindow.cpp
View File

@ -370,12 +370,15 @@ void MainWindow::displayInitialOptionsDialog(const InitialOptions &options, bool
{ {
auto o = new InitialOptionsDialog(this); auto o = new InitialOptionsDialog(this);
o->setAttribute(Qt::WA_DeleteOnClose); o->setAttribute(Qt::WA_DeleteOnClose);
o->loadOptions(options);
o->show();
if (skipOptionsDialog) { if (skipOptionsDialog) {
o->setupAndStartAnalysis(); o->setupAndStartAnalysis();
} }
else
{
o->loadOptions(options);
o->show();
}
} }
void MainWindow::openProject(const QString &project_name) void MainWindow::openProject(const QString &project_name)

2
src/dialogs/NewFileDialog.cpp
View File

@ -369,7 +369,7 @@ void NewFileDialog::loadFile(const QString &filename)
ioFile += filename; ioFile += filename;
InitialOptions options; InitialOptions options;
options.filename = ioFile; options.filename = ioFile;
main->openNewFile(options); main->openNewFile(options, ui->checkBox_FilelessOpen->isChecked());
close(); close();
} }