drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-20 11:03:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Edit main.cpp

Browse Source
This commit is contained in:
collecting
2025-09-24 04:35:09 +00:00
parent af223e445f
commit 4ec8ddbcf7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/citron/main.cpp
View File

@@ -5465,7 +5465,7 @@ int main(int argc, char* argv[]) {
// Tell the bundled OpenSSL where to find the bundled certificates. // Tell the bundled OpenSSL where to find the bundled certificates.
const QDir app_dir(QCoreApplication::applicationDirPath()); const QDir app_dir(QCoreApplication::applicationDirPath());
const QString certs_path = app_dir.filePath("../etc/ssl/certs"); const QString certs_path = app_dir.filePath(QString::fromLatin1("../etc/ssl/certs"));
qputenv("SSL_CERT_DIR", certs_path.toUtf8()); qputenv("SSL_CERT_DIR", certs_path.toUtf8());
} }
@@ -5535,15 +5535,17 @@ int main(int argc, char* argv[]) {
QApplication app(argc, argv); QApplication app(argc, argv);
#ifdef CITRON_USE_AUTO_UPDATER
// Check for and apply staged updates before starting the main application // Check for and apply staged updates before starting the main application
std::filesystem::path app_dir = std::filesystem::path(QCoreApplication::applicationDirPath().toStdString()); std::filesystem::path app_dir = std::filesystem::path(QCoreApplication::applicationDirPath().toStdString());
if (Updater::UpdaterService::HasStagedUpdate(app_dir)) { if (Updater::UpdaterService::HasStagedUpdate(app_dir)) {
if (Updater::UpdaterService::ApplyStagedUpdate(app_dir)) { if (Updater::UpdaterService::ApplyStagedUpdate(app_dir)) {
// Show a simple message that update was applied // Show a simple message that update was applied
QMessageBox::information(nullptr, QObject::tr("Update Applied"), QMessageBox::information(nullptr, QObject::tr("Update Applied"),
QObject::tr("Citron has been updated successfully!")); QObject::tr("Citron has been updated successfully!"));
} }
} }
#endif
#ifdef _WIN32 #ifdef _WIN32
OverrideWindowsFont(); OverrideWindowsFont();
@@ -5594,6 +5596,7 @@ void GMainWindow::OnCheckForUpdates() {
} }
void GMainWindow::CheckForUpdatesAutomatically() { void GMainWindow::CheckForUpdatesAutomatically() {
#ifdef CITRON_USE_AUTO_UPDATER
// Check if automatic updates are enabled // Check if automatic updates are enabled
if (!Settings::values.enable_auto_update_check.GetValue()) { if (!Settings::values.enable_auto_update_check.GetValue()) {
return; return;
@@ -5613,9 +5616,9 @@ void GMainWindow::CheckForUpdatesAutomatically() {
if (has_update) { if (has_update) {
// Show a subtle notification that an update is available // Show a subtle notification that an update is available
QMessageBox::information(this, tr("Update Available"), QMessageBox::information(this, tr("Update Available"),
tr("A new version of Citron is available: %1\n\n" tr("A new version of Citron is available: %1\n\n"
"Click Help → Check for Updates to download it.") "Click Help → Check for Updates to download it.")
.arg(QString::fromStdString(update_info.version))); .arg(QString::fromStdString(update_info.version)));
} }
updater_service->deleteLater(); updater_service->deleteLater();
}); });
@@ -5627,12 +5630,13 @@ void GMainWindow::CheckForUpdatesAutomatically() {
result == Updater::UpdaterService::UpdateResult::Failed) { result == Updater::UpdaterService::UpdateResult::Failed) {
// Silent fail for automatic checks - just log the error // Silent fail for automatic checks - just log the error
LOG_WARNING(Frontend, "Automatic update check failed: {}", message.toStdString()); LOG_WARNING(Frontend, "Automatic update check failed: {}", message.toStdString());
} }
updater_service->deleteLater(); updater_service->deleteLater();
}); });
// Start the silent update check // Start the silent update check
updater_service->CheckForUpdates(update_url); updater_service->CheckForUpdates(update_url);
#endif
} }
void GMainWindow::OnToggleGridView() { void GMainWindow::OnToggleGridView() {