Build fix for GTK GUI, re-declaration of an external symbol of a different type is a dangerous thing.
This commit is contained in:
parent
d8d696e1a1
commit
fc1ce9da85
|
@ -1,4 +1,4 @@
|
||||||
// HotKeyConf.cpp
|
// MovieOptions.cpp
|
||||||
//
|
//
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -759,8 +759,7 @@ static void KeyboardCommands (void)
|
||||||
|
|
||||||
if (_keyonly (Hotkeys[HK_TOGGLE_SUBTITLE]))
|
if (_keyonly (Hotkeys[HK_TOGGLE_SUBTITLE]))
|
||||||
{
|
{
|
||||||
extern int movieSubtitles;
|
movieSubtitles = !movieSubtitles;
|
||||||
movieSubtitles ^= 1;
|
|
||||||
FCEUI_DispMessage ("Movie subtitles o%s.", 0,
|
FCEUI_DispMessage ("Movie subtitles o%s.", 0,
|
||||||
movieSubtitles ? "n" : "ff");
|
movieSubtitles ? "n" : "ff");
|
||||||
}
|
}
|
||||||
|
|
|
@ -822,7 +822,6 @@ int main(int argc, char *argv[])
|
||||||
input_display = id;
|
input_display = id;
|
||||||
// not exactly an id as an true/false switch; still better than creating another int for that
|
// not exactly an id as an true/false switch; still better than creating another int for that
|
||||||
g_config->getOption("SDL.SubtitleDisplay", &id);
|
g_config->getOption("SDL.SubtitleDisplay", &id);
|
||||||
extern int movieSubtitles;
|
|
||||||
movieSubtitles = id;
|
movieSubtitles = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue