diff options
| author |  Szymon Tomasz Stefanek | 2015-08-27 04:16:03 +0200 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2015-08-27 04:16:03 +0200 |
| commit | b59a43f57ecc290d6798a29402256c169f5b1bd2 (patch) | |
| tree | 33a115a647c2a8acdf38181026b141407dc12ffd /src/modules/theme/WebThemeInterfaceDialog.cpp | |
| parent | Merge branch 'master' of https://github.com/kvirc/KVIrc (diff) | |
| download | KVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.tar.gz KVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.tar.bz2 KVIrc-b59a43f57ecc290d6798a29402256c169f5b1bd2.zip | |
More work on theme packing
Diffstat (limited to 'src/modules/theme/WebThemeInterfaceDialog.cpp')
| -rw-r--r-- | src/modules/theme/WebThemeInterfaceDialog.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp index 4c0345793..ceb4e9ca0 100644 --- a/src/modules/theme/WebThemeInterfaceDialog.cpp +++ b/src/modules/theme/WebThemeInterfaceDialog.cpp @@ -65,9 +65,12 @@ bool WebThemeInterfaceDialog::installPackage(const QString &szPath,QString &szEr bool WebThemeInterfaceDialog::packageIsInstalled(const QString &szId,const QString &szVersion) { + QString szSubdir = szId + QString("-") + szVersion; + szSubdir.replace(QRegExp("[^a-zA-Z0-9_\\-.][^a-zA-Z0-9_\\-.]*"),"_"); + return \ - KviFileUtils::fileExists(m_szGlobalThemesPath+szId+"-"+szVersion) || \ - KviFileUtils::fileExists(m_szLocalThemesPath+szId+"-"+szVersion); + KviFileUtils::fileExists(m_szGlobalThemesPath+szSubdir) || \ + KviFileUtils::fileExists(m_szLocalThemesPath+szSubdir); } |