Browse Source

Don't show multiple unlock UI dialogs. Closes #2040.

adaptive-webui-19844
sledgehammer999 10 years ago
parent
commit
c2f2d0a363
  1. 8
      src/mainwindow.cpp
  2. 1
      src/mainwindow.h

8
src/mainwindow.cpp

@ -101,7 +101,7 @@ using namespace libtorrent;
*****************************************************/ *****************************************************/
// Constructor // Constructor
MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMainWindow(parent), m_posInitialized(false), force_exit(false) MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMainWindow(parent), m_posInitialized(false), force_exit(false), unlockDlgShowing(false)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
, has_python(false) , has_python(false)
#endif #endif
@ -686,8 +686,14 @@ void MainWindow::setTabText(int index, QString text) const {
} }
bool MainWindow::unlockUI() { bool MainWindow::unlockUI() {
if (unlockDlgShowing)
return false;
else
unlockDlgShowing = true;
bool ok = false; bool ok = false;
QString clear_password = AutoExpandableDialog::getText(this, tr("UI lock password"), tr("Please type the UI lock password:"), QLineEdit::Password, "", &ok); QString clear_password = AutoExpandableDialog::getText(this, tr("UI lock password"), tr("Please type the UI lock password:"), QLineEdit::Password, "", &ok);
unlockDlgShowing = false;
if (!ok) return false; if (!ok) return false;
Preferences* const pref = Preferences::instance(); Preferences* const pref = Preferences::instance();
QString real_pass_md5 = pref->getUILockPasswordMD5(); QString real_pass_md5 = pref->getUILockPasswordMD5();

1
src/mainwindow.h

@ -183,6 +183,7 @@ private:
bool displaySpeedInTitle; bool displaySpeedInTitle;
bool force_exit; bool force_exit;
bool ui_locked; bool ui_locked;
bool unlockDlgShowing;
LineEdit *search_filter; LineEdit *search_filter;
// Keyboard shortcuts // Keyboard shortcuts
QShortcut *switchSearchShortcut; QShortcut *switchSearchShortcut;

Loading…
Cancel
Save