Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'revert_dbus_exit_crash_fix' into 'mer-5.6'
[qtbase] Revert crash on exit fix. Contributes to JB#53350

See merge request mer-core/qtbase!80
  • Loading branch information
pvuorela committed Mar 29, 2021
2 parents d69b282 + fe96a38 commit 43a7947
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions src/dbus/qdbusconnection.cpp
Expand Up @@ -68,16 +68,6 @@ static void preventDllUnload();

Q_GLOBAL_STATIC(QDBusConnectionManager, _q_manager)

static void shutdownConnectionManager()
{
if (_q_manager.exists()) {
auto manager = _q_manager();

manager->quit();
manager->wait();
}
}

struct QDBusConnectionManager::ConnectionRequestData
{
enum RequestType {
Expand Down Expand Up @@ -152,12 +142,12 @@ QDBusConnectionManager::QDBusConnectionManager()
#endif
defaultBuses[0] = defaultBuses[1] = Q_NULLPTR;
start();

qAddPostRoutine(shutdownConnectionManager);
}

QDBusConnectionManager::~QDBusConnectionManager()
{
quit();
wait();
}

QDBusConnectionManager* QDBusConnectionManager::instance()
Expand Down

0 comments on commit 43a7947

Please sign in to comment.