d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-10 12:21:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3234 from glassez/openfile

Browse Source 
Fix crash when cancel open file dialog.
This commit is contained in:
sledgehammer999 2015-06-16 22:55:57 +03:00
commit 061fbeff56
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/mainwindow.cpp
View File

@ -1028,6 +1028,7 @@ void MainWindow::on_actionOpen_triggered()
QFileDialog::getOpenFileNames(0, tr("Open Torrent Files"), pref->getMainLastDir(), QFileDialog::getOpenFileNames(0, tr("Open Torrent Files"), pref->getMainLastDir(),
tr("Torrent Files") + QString::fromUtf8(" (*.torrent)")); tr("Torrent Files") + QString::fromUtf8(" (*.torrent)"));
const bool useTorrentAdditionDialog = Preferences::instance()->useAdditionDialog(); const bool useTorrentAdditionDialog = Preferences::instance()->useAdditionDialog();
if (!pathsList.isEmpty()) {
foreach (QString file, pathsList) { foreach (QString file, pathsList) {
qDebug("Dropped file %s on download list", qPrintable(file)); qDebug("Dropped file %s on download list", qPrintable(file));
if (useTorrentAdditionDialog) if (useTorrentAdditionDialog)
@ -1041,6 +1042,7 @@ void MainWindow::on_actionOpen_triggered()
top_dir.removeLast(); top_dir.removeLast();
pref->setMainLastDir(Utils::Fs::fromNativePath(top_dir.join("/"))); pref->setMainLastDir(Utils::Fs::fromNativePath(top_dir.join("/")));
} }
}
void MainWindow::activate() void MainWindow::activate()
{ {