openkylin
/
ukui-screensaver
mirror of https://gitee.com/openkylin/ukui-screensaver.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(free mem): release QSettings pointer memory 

Description: 释放qsettings指针内存

Log: I5M3SK 内存泄露
This commit is contained in:
winnerym 2023-04-12 09:46:15 +08:00
parent 104c0fcc64
commit 23dc81334a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
screensaver/screensaver.cpp
View File

@ -637,6 +637,10 @@ void Screensaver::setUpdateCenterWidget()
QString languageDirPath=cwdPath+"language/";
QString defaultLanguageFilePath=languageDirPath+"screensaver-en_US.ini";
qDebug()<<"homePath="<<homePath;
if (qsettings) {
delete qsettings;
qsettings = nullptr;
}
if (!lang.isEmpty()){
qDebug()<<"lang = "<<lang;
if(lang.contains('.')){
@ -663,19 +667,19 @@ void Screensaver::setUpdateCenterWidget()
}
if(useJd && jdConfigFileInfo.isFile()){
qsettings = new QSettings(jdLanguageFilePath,QSettings::IniFormat);
qsettings = new QSettings(jdLanguageFilePath,QSettings::IniFormat,this);
}else if (homeConfigFileInfo.isFile()){
qsettings = new QSettings(homeLanguageFilePath,QSettings::IniFormat);
qsettings = new QSettings(homeLanguageFilePath,QSettings::IniFormat,this);
}
else if(fileInfo.isFile()){
qsettings = new QSettings(languageFilePath,QSettings::IniFormat);
qsettings = new QSettings(languageFilePath,QSettings::IniFormat,this);
}
else{
qsettings = new QSettings(defaultLanguageFilePath,QSettings::IniFormat);
qsettings = new QSettings(defaultLanguageFilePath,QSettings::IniFormat,this);
}
}
else{
qsettings = new QSettings(defaultLanguageFilePath,QSettings::IniFormat);
qsettings = new QSettings(defaultLanguageFilePath,QSettings::IniFormat,this);
}
qsettings->setIniCodec(QTextCodec::codecForName("UTF-8"));
@ -773,7 +777,7 @@ void Screensaver::onBackgroundChanged()
}
void Screensaver::updateCenterWidget(int index)
{
if(!centerWidget )
if(!centerWidget || !qsettings)
return ;
QStringList qlist = qsettings->childGroups();
@ -1197,6 +1201,8 @@ void Screensaver::setPreviewText(bool bVisible)
void Screensaver::setCenterWidget()
{
if (!qsettings)
return ;
QStringList qlist = qsettings->childGroups();
if(qlist.count()<1)
return;

2
screensaver/screensaver.h
View File

@ -111,7 +111,7 @@ private:
QPushButton *settingsButton;
QPushButton *WallpaperButton;
QWidget *buttonWidget;
QSettings *qsettings;
QSettings *qsettings = nullptr;
MBackground *m_background;