Fixed handling of configurations with full stops in the name.

This commit is contained in:
SarahW 2017-12-14 18:49:09 +00:00
commit c0048bc24f
2 changed files with 7 additions and 25 deletions

View file

@ -249,22 +249,20 @@ void initpc(int argc, char *argv[])
} }
else if (!strcasecmp(argv[c], "--config")) else if (!strcasecmp(argv[c], "--config"))
{ {
int d; char *ext;
if ((c+1) == argc) if ((c+1) == argc)
break; break;
strncpy(config_file_default, argv[c+1], 256); strncpy(config_file_default, argv[c+1], 256);
strcpy(config_name, get_filename(config_file_default)); strcpy(config_name, get_filename(config_file_default));
for (d = 0; d < strlen(config_name); d++) ext = get_extension(config_name);
if (ext && ext[0])
{ {
if (config_name[d] == '.') ext--;
{ *ext = 0;
config_name[d] = 0;
break;
}
} }
config_override = 1; config_override = 1;
c++; c++;
} }

View file

@ -32,7 +32,7 @@ static void select_config(void* hdlg, char* name)
static void config_list_update(void* hdlg) static void config_list_update(void* hdlg)
{ {
char s[512]; char s[512];
int num, c, p; int num, p;
void* h; void* h;
strcpy(s, configs_path); strcpy(s, configs_path);
@ -47,22 +47,6 @@ static void config_list_update(void* hdlg)
num = wx_sendmessage(h, WX_LB_GETCOUNT, 0, 0); num = wx_sendmessage(h, WX_LB_GETCOUNT, 0, 0);
for (c = 0; c < num; c++)
{
char *ext;
wx_sendmessage(h, WX_LB_GETTEXT, c, (LONG_PARAM)s);
ext = get_extension(s);
if (ext && ext[0])
{
ext--;
*ext = 0;
}
wx_sendmessage(h, WX_LB_DELETESTRING, c, 0);
wx_sendmessage(h, WX_LB_INSERTSTRING, c, (LONG_PARAM)s);
}
if (num > 0) if (num > 0)
{ {
if (p >= num) if (p >= num)