[Scummvm-cvs-logs] SF.net SVN: scummvm:[43575] scummvm/branches/branch-1-0-0/backends/platform /ds/arm9/source

[agent-q at users.sourceforge.net]

Revision: 43575
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43575&view=rev
Author:   agent-q
Date:     2009-08-21 00:00:28 +0000 (Fri, 21 Aug 2009)

Log Message:
-----------
DS: Fix crash when returning to launcher from AGI game and starting another.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.cpp
    scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.h

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp	2009-08-20 22:41:43 UTC (rev 43574)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/osystem_ds.cpp	2009-08-21 00:00:28 UTC (rev 43575)
@@ -38,6 +38,10 @@
 #include "touchkeyboard.h"
 #include "backends/fs/ds/ds-fs-factory.h"
 
+#ifdef ENABLE_AGI
+#include "wordcompletion.h"
+#endif
+
 #include <time.h>
 
 #if defined(DS_BUILD_A)
@@ -876,6 +880,11 @@
 void OSystem_DS::engineDone() {
 	// Scumm games appear not to stop their CD audio, so I stop the CD here.
 	stopCD();
+
+#ifdef ENABLE_AGI
+	DS::clearAutoCompleteWordList();
+#endif
+	
 }
 
 

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.cpp	2009-08-20 22:41:43 UTC (rev 43574)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.cpp	2009-08-21 00:00:28 UTC (rev 43575)
@@ -60,6 +60,11 @@
 	return scumm_stricmp(*as, *bs);
 }
 
+void clearAutoCompleteWordList() {
+	wordBufferPtrPos = 0;
+	wordBufferPos = 0;
+}
+
 void sortAutoCompleteWordList() {
 	// Sort the whole word list into alphabetical order
 	qsort((void *)wordBufferPtr, wordBufferPtrPos, 4, stringCompare);

Modified: scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.h	2009-08-20 22:41:43 UTC (rev 43574)
+++ scummvm/branches/branch-1-0-0/backends/platform/ds/arm9/source/wordcompletion.h	2009-08-21 00:00:28 UTC (rev 43575)
@@ -1,5 +1,6 @@
 namespace DS {
 
+extern void clearAutoCompleteWordList();
 extern bool findWordCompletions(const char *input);
 extern void addAutoCompleteLine(const char *line);
 extern void sortAutoCompleteWordList();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.