Skip to content

fix: delay discovery service init to prevent focus stealing #726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
re2zero merged 1 commit into from
Apr 28, 2026
Merged

fix: delay discovery service init to prevent focus stealing #726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/lib/cooperation/core/cooperationcoreplugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2023 - 2024 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

Expand All @@ -24,6 +24,7 @@
#include <QCommandLineParser>
#include <QCommandLineOption>
#include <QStandardPaths>
#include <QTimer>
#ifdef __linux__
# include "base/reportlog/reportlogmanager.h"
# include <DFeatureDisplayDialog>
Expand Down Expand Up @@ -164,9 +165,6 @@ bool CooperaionCorePlugin::start()
connect(HistoryManager::instance(), &HistoryManager::connectHistoryUpdated, DiscoverController::instance(), &DiscoverController::onConnectHistoryUpdated);
DLOG << "Connected history update signals";

DiscoverController::instance()->init(); // init zeroconf and regist
DLOG << "Discover controller initialized";

// start network status listen after all ready
CooperationUtil::instance()->initNetworkListener();
DLOG << "Network listener initialized";
Expand Down Expand Up @@ -199,6 +197,15 @@ bool CooperaionCorePlugin::start()
dMain->show();
}

if (!onlyTransfer) {
// Delay discovery init to ensure main window is visible first,
// preventing focus stealing from the discovery/auth dialog
QTimer::singleShot(500, this, []() {
DiscoverController::instance()->init();
DLOG << "Discover controller initialized (delayed)";
});
}

return true;
}

Expand Down
Loading