summaryrefslogtreecommitdiff
path: root/protocols/Xfire
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-01 21:11:59 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-01 21:11:59 +0000
commitb2269a81668efaf157d541f2ffd67e52b89417c6 (patch)
tree128980a09b93abf48f63ee78bb51a041b607e8a2 /protocols/Xfire
parentbe6c3121411e55055383900f45d17a1ef887ccdd (diff)
useless Folders support checks removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@3824 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Xfire')
-rw-r--r--protocols/Xfire/src/main.cpp16
-rw-r--r--protocols/Xfire/src/variables.cpp5
2 files changed, 8 insertions, 13 deletions
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index e723338788..d15a51e169 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1200,18 +1200,14 @@ extern "C" __declspec(dllexport) int Load(void)
strcat(AvatarsFolder, CurProfile);
strcat(AvatarsFolder, "\\");
strcat(AvatarsFolder, "XFire");
- if (ServiceExists(MS_FOLDERS_REGISTER_PATH)){
- XFireWorkingFolder = FoldersRegisterCustomPath(protocolname, "Working Folder", AvatarsFolder);
- XFireIconFolder = FoldersRegisterCustomPath(protocolname, "Game Icon Folder", AvatarsFolder);
- }
- else
- CreateDirectory(AvatarsFolder,NULL);
+
+ XFireWorkingFolder = FoldersRegisterCustomPath(protocolname, "Working Folder", AvatarsFolder);
+ if ( !(XFireIconFolder = FoldersRegisterCustomPath(protocolname, "Game Icon Folder", AvatarsFolder)))
+ CreateDirectory(AvatarsFolder, NULL);
strcat(AvatarsFolder, "\\Avatars");
- if (ServiceExists(MS_FOLDERS_REGISTER_PATH))
- XFireAvatarFolder = FoldersRegisterCustomPath(protocolname, "Avatars", AvatarsFolder);
- else
- CreateDirectory(AvatarsFolder,NULL);
+ if ( !(XFireAvatarFolder = FoldersRegisterCustomPath(protocolname, "Avatars", AvatarsFolder)))
+ CreateDirectory(AvatarsFolder,NULL);
//erweiterte Kontextmenüpunkte
CLISTMENUITEM mi = { sizeof(mi) };
diff --git a/protocols/Xfire/src/variables.cpp b/protocols/Xfire/src/variables.cpp
index 1ba54f6ddd..d1e0d64df0 100644
--- a/protocols/Xfire/src/variables.cpp
+++ b/protocols/Xfire/src/variables.cpp
@@ -4,6 +4,8 @@
#include "variables.h"
#include <string>
+extern HANDLE XFireWorkingFolder, XFireIconFolder, XFireAvatarFolder;
+
using namespace std;
char* Varxfiregame(ARGUMENTSINFO *ai)
@@ -169,9 +171,6 @@ char* Varmyxfirevoice(ARGUMENTSINFO *ai)
char* XFireGetFoldersPath(char * pathtype)
{// Get XFire folder path
-extern HANDLE XFireWorkingFolder;
-extern HANDLE XFireIconFolder;
-extern HANDLE XFireAvatarFolder;
static char path[1024]; path[0] = 0;
if (ServiceExists(MS_FOLDERS_REGISTER_PATH)){
if (!strcmp(pathtype,"Avatar")){