ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 19:06:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Check file using CutterCore::tryFile() instead of QFileInfo

Browse Source
This commit is contained in:
Florian Märkl 2018-01-07 11:58:37 +01:00
parent ec7cef1394
commit 266402095f
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cutter.cpp
View File

@ -414,7 +414,6 @@ bool CutterCore::tryFile(QString path, bool rw)
cf = r_core_file_open(this->core_, path.toUtf8().constData(), flags, 0LL);
if (!cf)
{
eprintf("QRCore::tryFile: Cannot open file?\n");
return false;
}

35
src/dialogs/NewFileDialog.cpp
View File

@ -305,32 +305,29 @@ bool NewFileDialog::fillProjectsList()
void NewFileDialog::loadFile(const QString &filename)
{
// Check that there is a file selected
QFileInfo checkfile(filename);
if (!checkfile.exists() || !checkfile.isFile())
if(!Core()->tryFile(filename, false))
{
QMessageBox msgBox(this);
msgBox.setText(tr("Select a new program or a previous one\nbefore continuing"));
msgBox.setText(tr("Select a new program or a previous one before continuing."));
msgBox.exec();
return;
}
else
{
// Add file to recent file list
QSettings settings;
QStringList files = settings.value("recentFileList").toStringList();
files.removeAll(filename);
files.prepend(filename);
while (files.size() > MaxRecentFiles)
files.removeLast();
settings.setValue("recentFileList", files);
// Add file to recent file list
QSettings settings;
QStringList files = settings.value("recentFileList").toStringList();
files.removeAll(filename);
files.prepend(filename);
while (files.size() > MaxRecentFiles)
files.removeLast();
// Close dialog and open MainWindow/OptionsDialog
MainWindow *main = new MainWindow();
main->openNewFile(filename);
settings.setValue("recentFileList", files);
close();
}
// Close dialog and open MainWindow/OptionsDialog
MainWindow *main = new MainWindow();
main->openNewFile(filename);
close();
}
void NewFileDialog::loadProject(const QString &project)

2
src/dialogs/OptionsDialog.cpp
View File

@ -67,8 +67,6 @@ OptionsDialog::OptionsDialog(MainWindow *main):
connect(ui->cancelButton, SIGNAL(clicked()), this, SLOT(reject()));
ui->programLineEdit->setText(main->getFilename());
QFileInfo fi(this->main->getFilename());
this->core->tryFile(fi.filePath(), fi.isWritable());
}
OptionsDialog::~OptionsDialog() {}