do_subtitles doesn't abort anymore when using --nosubtitles. fixes #132
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@729 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
@@ -1972,9 +1972,6 @@ int
|
|||||||
do_subtitles (UNICODE *pStr)
|
do_subtitles (UNICODE *pStr)
|
||||||
{
|
{
|
||||||
static UNICODE *last_page = NULL;;
|
static UNICODE *last_page = NULL;;
|
||||||
// TODO: proper disabling of subtitles, this one prolly isn't 'safe'
|
|
||||||
if (optSubtitles == FALSE)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (pStr == 0)
|
if (pStr == 0)
|
||||||
return (subtitle_state = DONE_SUBTITLE);
|
return (subtitle_state = DONE_SUBTITLE);
|
||||||
@@ -1998,8 +1995,15 @@ do_subtitles (UNICODE *pStr)
|
|||||||
{
|
{
|
||||||
TEXT t;
|
TEXT t;
|
||||||
CONTEXT OldContext;
|
CONTEXT OldContext;
|
||||||
|
|
||||||
CommData.AlienTextTemplate.pStr = pStr;
|
if (optSubtitles)
|
||||||
|
{
|
||||||
|
CommData.AlienTextTemplate.pStr = pStr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
CommData.AlienTextTemplate.pStr = "";
|
||||||
|
}
|
||||||
t = CommData.AlienTextTemplate;
|
t = CommData.AlienTextTemplate;
|
||||||
|
|
||||||
OldContext = SetContext (TaskContext);
|
OldContext = SetContext (TaskContext);
|
||||||
|
|||||||
Reference in New Issue
Block a user