github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-19 12:59:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #11977 from Chocobo1/init

Browse source 
Fix singleton class ownership
This commit is contained in:
Mike Tzou 2020-02-08 12:10:27 +08:00 • committed by GitHub
commit 8b330e3ac0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/app/application.cpp
View file

@ -550,7 +550,7 @@ int Application::exec(const QStringList &params)
#ifndef DISABLE_COUNTRIES_RESOLUTION #ifndef DISABLE_COUNTRIES_RESOLUTION
Net::GeoIPManager::initInstance(); Net::GeoIPManager::initInstance();
#endif #endif
ScanFoldersModel::initInstance(this); ScanFoldersModel::initInstance();
#ifndef DISABLE_WEBUI #ifndef DISABLE_WEBUI
m_webui = new WebUI; m_webui = new WebUI;

10
src/base/scanfoldersmodel.cpp
View file

@ -57,14 +57,10 @@ struct ScanFoldersModel::PathData
ScanFoldersModel *ScanFoldersModel::m_instance = nullptr; ScanFoldersModel *ScanFoldersModel::m_instance = nullptr;
bool ScanFoldersModel::initInstance(QObject *parent) void ScanFoldersModel::initInstance()
{ {
if (!m_instance) { if (!m_instance)
m_instance = new ScanFoldersModel(parent); m_instance = new ScanFoldersModel;
return true;
}
return false;
} }
void ScanFoldersModel::freeInstance() void ScanFoldersModel::freeInstance()

2
src/base/scanfoldersmodel.h
View file

@ -65,7 +65,7 @@ public:
CUSTOM_LOCATION CUSTOM_LOCATION
}; };
static bool initInstance(QObject *parent = nullptr); static void initInstance();
static void freeInstance(); static void freeInstance();
static ScanFoldersModel *instance(); static ScanFoldersModel *instance();