diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-28 11:12:19 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-02-28 11:12:19 +0000 |
| commit | e44d626b32c534cace3a54d54778dfa9cf3599c9 (patch) | |
| tree | a95c360ecc005240041a31fc1c13554cd72dfefb /plugins/Variables/src/parse_external.cpp | |
| parent | b1530a48bd67d19f6a18355e04a884b36c696e8b (diff) | |
Variables:
-Minor fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@12285 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables/src/parse_external.cpp')
| -rw-r--r-- | plugins/Variables/src/parse_external.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/plugins/Variables/src/parse_external.cpp b/plugins/Variables/src/parse_external.cpp index 07fc3643b6..47aefa0410 100644 --- a/plugins/Variables/src/parse_external.cpp +++ b/plugins/Variables/src/parse_external.cpp @@ -60,8 +60,8 @@ static TCHAR *parseWinampSong(ARGUMENTSINFO *ai) return NULL;
TCHAR *scur = _tcschr(szTitle, '.');
- TCHAR *cur = _tcsstr(scur, _T(" - Winamp"));
- if ((scur == NULL) || (cur == NULL) || (scur >= cur) || (scur > (szTitle + _tcslen(szTitle) - 2)) || (cur > (szTitle + _tcslen(szTitle)))) {
+ TCHAR *cur;
+ if ((scur == NULL) || ((cur = _tcsstr(scur, _T(" - Winamp"))) == NULL) || (scur >= cur) || (scur > (szTitle + _tcslen(szTitle) - 2)) || (cur > (szTitle + _tcslen(szTitle)))) {
mir_free(szTitle);
return NULL;
}
@@ -86,21 +86,17 @@ static TCHAR *parseWinampState(ARGUMENTSINFO *ai) return NULL;
TCHAR *scur = _tcschr(szTitle, '.');
- TCHAR *cur = _tcsstr(scur, _T(" - Winamp"));
- if (scur == NULL || cur == NULL) {
- mir_free(szTitle);
- return mir_tstrdup(TranslateT("Stopped"));
- }
- if ((!_tcsncmp(cur + 10, _T("[Stopped]"), 9))) {
- mir_free(szTitle);
- return mir_tstrdup(TranslateT("Stopped"));
- }
- if ((!_tcsncmp(cur + 10, _T("[Paused]"), 8))) {
- mir_free(szTitle);
- return mir_tstrdup(TranslateT("Paused"));
- }
+ TCHAR *cur;
+ if (scur == NULL || (cur = _tcsstr(scur, _T(" - Winamp"))) == NULL)
+ res = mir_tstrdup(TranslateT("Stopped"));
+ else if ((!_tcsncmp(cur + 10, _T("[Stopped]"), 9)))
+ res = mir_tstrdup(TranslateT("Stopped"));
+ else if ((!_tcsncmp(cur + 10, _T("[Paused]"), 8)))
+ res = mir_tstrdup(TranslateT("Paused"));
+ else
+ res = mir_tstrdup(_T("Playing"));
mir_free(szTitle);
- return mir_tstrdup(_T("Playing"));
+ return res;
}
void registerExternalTokens()
|