benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving merge conflicts

Browse Source
This commit is contained in:
Jeremy Borgman
2021-01-08 09:58:52 -06:00
parent c84b6df7d3 b1ba67ac4d
commit 73fe772b70
90 changed files with 7190 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/geneneralconf.cpp
View File

@@ -315,7 +315,7 @@ void GeneneralConf::changeSavePath()
QStandardPaths::writableLocation(QStandardPaths::PicturesLocation));
if (!path.isEmpty()) {
m_savePath->setText(path);
ConfigHandler().setSaveAfterCopyPath(path);
ConfigHandler().setSavePath(path);
}
}