chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 19:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into check-channel-ptr

Browse Source
This commit is contained in:
Phil Olynyk 2020-04-30 12:47:08 -04:00
commit 0e1cabbad5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oscar/main.cpp
View File

@ -196,11 +196,11 @@ bool migrateFromSH(QString destDir) {
if (!file.exists() || !dirP.exists()) { // It doesn't have a Preferences.xml file or a Profiles directory in it if (!file.exists() || !dirP.exists()) { // It doesn't have a Preferences.xml file or a Profiles directory in it
// Not a new directory.. nag the user. // Not a new directory.. nag the user.
if (QMessageBox::warning(nullptr, STR_MessageBox_Error, QMessageBox::warning(nullptr, STR_MessageBox_Error,
QObject::tr("The folder you chose does not contain valid SleepyHead data.") + QObject::tr("The folder you chose does not contain valid SleepyHead data.") +
"\n\n"+QObject::tr("You cannot use this folder:")+" " + datadir ), QMessageBox::Ok) { "\n\n"+QObject::tr("You cannot use this folder:")+" " + datadir,
continue; // Nope, don't use it, go around the loop again QMessageBox::Ok);
} continue; // Nope, don't use it, go around the loop again
} }
qDebug() << "Migration folder is" << datadir; qDebug() << "Migration folder is" << datadir;