diff --git a/src/lib/bookmarksimport/bookmarksimportdialog.cpp b/src/lib/bookmarksimport/bookmarksimportdialog.cpp index fdae48daa..598c317af 100644 --- a/src/lib/bookmarksimport/bookmarksimportdialog.cpp +++ b/src/lib/bookmarksimport/bookmarksimportdialog.cpp @@ -192,7 +192,6 @@ bool BookmarksImportDialog::exportedOK() QMessageBox::critical(this, tr("Error!"), firefox.errorString()); return false; } - return true; } else if (m_browser == Chrome) { ChromeImporter chrome(this); @@ -205,7 +204,6 @@ bool BookmarksImportDialog::exportedOK() QMessageBox::critical(this, tr("Error!"), chrome.errorString()); return false; } - return true; } else if (m_browser == Opera) { OperaImporter opera(this); @@ -218,7 +216,6 @@ bool BookmarksImportDialog::exportedOK() QMessageBox::critical(this, tr("Error!"), opera.errorString()); return false; } - return true; } else if (m_browser == Html) { HtmlImporter html(this); @@ -231,10 +228,14 @@ bool BookmarksImportDialog::exportedOK() QMessageBox::critical(this, tr("Error!"), html.errorString()); return false; } - return true; } - return false; + if (m_exportedBookmarks.isEmpty()) { + QMessageBox::critical(this, tr("Error!"), tr("The file doesn't contain any bookmark.")); + return false; + } + + return true; } void BookmarksImportDialog::setFile() diff --git a/src/lib/preferences/preferences.ui b/src/lib/preferences/preferences.ui index 92b7e5042..cb7240766 100644 --- a/src/lib/preferences/preferences.ui +++ b/src/lib/preferences/preferences.ui @@ -1738,7 +1738,11 @@ - + + + Leave blank if unsure + +