no, I'd really like the prompt to ALWAYS load please :)
This commit is contained in:
parent
077e01afd6
commit
284862cd31
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,3 +1,10 @@
|
|||||||
|
lubuntu-installer-prompt (24.04.4) noble; urgency=medium
|
||||||
|
|
||||||
|
* Fix a race condition where a wired network connection could hang the
|
||||||
|
installer prompt during startup.
|
||||||
|
|
||||||
|
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Sun, 24 Mar 2024 20:40:48 -0500
|
||||||
|
|
||||||
lubuntu-installer-prompt (24.04.3) noble; urgency=medium
|
lubuntu-installer-prompt (24.04.3) noble; urgency=medium
|
||||||
|
|
||||||
* Don't let people close modal windows so they don't accidentally confuse
|
* Don't let people close modal windows so they don't accidentally confuse
|
||||||
|
@ -44,8 +44,6 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
|
|||||||
|
|
||||||
cpd = new ConnectionProgressDialog();
|
cpd = new ConnectionProgressDialog();
|
||||||
|
|
||||||
updateConnectionInfo();
|
|
||||||
|
|
||||||
initLanguageComboBox();
|
initLanguageComboBox();
|
||||||
|
|
||||||
connect(ui->tryLubuntu, &QPushButton::clicked, this, &InstallerPrompt::onTryClicked);
|
connect(ui->tryLubuntu, &QPushButton::clicked, this, &InstallerPrompt::onTryClicked);
|
||||||
@ -65,6 +63,8 @@ InstallerPrompt::InstallerPrompt(QWidget *parent)
|
|||||||
QTimer *repeater = new QTimer();
|
QTimer *repeater = new QTimer();
|
||||||
connect(repeater, SIGNAL(timeout()), this, SLOT(updateConnectionInfo()));
|
connect(repeater, SIGNAL(timeout()), this, SLOT(updateConnectionInfo()));
|
||||||
repeater->start(15000);
|
repeater->start(15000);
|
||||||
|
|
||||||
|
updateConnectionInfo();
|
||||||
}
|
}
|
||||||
|
|
||||||
InstallerPrompt::~InstallerPrompt()
|
InstallerPrompt::~InstallerPrompt()
|
||||||
@ -317,10 +317,14 @@ void InstallerPrompt::updateConnectionInfo()
|
|||||||
ui->networkComboBox->setCurrentIndex(connectedDevice);
|
ui->networkComboBox->setCurrentIndex(connectedDevice);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (NetworkManager::status() == NetworkManager::Connecting) {
|
if (!firstUpdateConnectionInfoCall) {
|
||||||
cpd->exec();
|
if (NetworkManager::status() == NetworkManager::Connecting) {
|
||||||
|
cpd->exec();
|
||||||
|
} else {
|
||||||
|
cpd->done(0);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
cpd->done(0);
|
firstUpdateConnectionInfoCall = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,6 +44,7 @@ private:
|
|||||||
QString wifiSsid;
|
QString wifiSsid;
|
||||||
bool wifiWrongHandling = false;
|
bool wifiWrongHandling = false;
|
||||||
QMap<QString, QString> languageLocaleMap;
|
QMap<QString, QString> languageLocaleMap;
|
||||||
|
bool firstUpdateConnectionInfoCall = true;
|
||||||
|
|
||||||
void initLanguageComboBox();
|
void initLanguageComboBox();
|
||||||
QStringList getAvailableLanguages();
|
QStringList getAvailableLanguages();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user