From c4ce44867f5ff1795918e27744e4d59261ada27b Mon Sep 17 00:00:00 2001 From: aurhat Date: Sat, 15 Nov 2014 16:43:26 +0100 Subject: [PATCH] Fix reset of packages source servers list Earlier "resetpckservers" command cleared this list, instead of reset to the initial settings. --- source/src/client.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/source/src/client.cpp b/source/src/client.cpp index 4ac6cb64..5e025c59 100644 --- a/source/src/client.cpp +++ b/source/src/client.cpp @@ -891,6 +891,8 @@ VARP(autodownload, 0, 1, 1); void resetpckservers() { pckservers.deletecontents(); + delfile(findfile("config" PATHDIVS "pcksources.cfg", "w")); + conoutf("%c3Restart AssaultCube to take effect after resetting the list of packages source servers", CC); } void addpckserver(char *addr) @@ -1157,10 +1159,12 @@ bool requirepackage(int type, const char *path) void writepcksourcecfg() { - stream *f = openfile(path("config/pcksources.cfg", true), "w"); - if(!f) return; - f->printf("// list of package source servers (only add servers you trust!)\n"); - loopv(pckservers) f->printf("\naddpckserver %s", pckservers[i]->addr); - f->printf("\n"); - delete f; + if(pckservers.length()) + { + stream *f = openfile("config" PATHDIVS "pcksources.cfg", "w"); + if(!f) return; + f->printf("// list of package source servers (only add servers you trust!)\n\n"); + loopv(pckservers) f->printf("addpckserver %s\n", pckservers[i]->addr); + delete f; + } }