[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: adonthell/src dialog.cc,1.22,1.23
From: |
Kai Sterker <address@hidden> |
Subject: |
[Adonthell-commits] CVS: adonthell/src dialog.cc,1.22,1.23 |
Date: |
Fri, 12 Apr 2002 16:51:34 -0400 |
Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv22867
Modified Files:
dialog.cc
Log Message:
FIXED crash when loading old dialogue script
FIXED memleak
Index: dialog.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/dialog.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** dialog.cc 12 Apr 2002 15:35:40 -0000 1.22
--- dialog.cc 12 Apr 2002 20:51:32 -0000 1.23
***************
*** 68,72 ****
// Extract the dialogue's strings
PyObject *list = dialogue.get_attribute ("text");
! if (!list) return false;
PyObject *s;
--- 68,72 ----
// Extract the dialogue's strings
PyObject *list = dialogue.get_attribute ("text");
! if (!list || !PyList_Check (list)) return false;
PyObject *s;
***************
*** 223,226 ****
--- 223,230 ----
stop = true;
}
+
+ // cleanup
+ Py_XDECREF (speaker);
+ Py_XDECREF (speech);
}
while (!stop);
***************
*** 228,235 ****
// init the iterator for dialogue text retrieval
i_text = text_.begin ();
-
- // cleanup
- Py_XDECREF (speaker);
- Py_XDECREF (speech);
}
--- 232,235 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: adonthell/src dialog.cc,1.22,1.23,
Kai Sterker <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dlg_compiler.cc,1.4,1.5
- Next by Date:
[Adonthell-commits] CVS: adonthell/src nls.cc,NONE,1.1 nls.h,NONE,1.1 Makefile.am,1.81,1.82 dialog.cc,1.23,1.24 lex.prefs.cc,1.5,1.6 main.cc,1.42,1.43 prefs.cc,1.11,1.12 prefs.h,1.11,1.12 prefs.l,1.6,1.7 py_adonthell.i,1.31,1.32 text_bubble.cc,1.4,1.5
- Previous by thread:
[Adonthell-commits] CVS: adonthell/src/tools/dlgedit dlg_compiler.cc,1.4,1.5
- Next by thread:
[Adonthell-commits] CVS: adonthell/src nls.cc,NONE,1.1 nls.h,NONE,1.1 Makefile.am,1.81,1.82 dialog.cc,1.23,1.24 lex.prefs.cc,1.5,1.6 main.cc,1.42,1.43 prefs.cc,1.11,1.12 prefs.h,1.11,1.12 prefs.l,1.6,1.7 py_adonthell.i,1.31,1.32 text_bubble.cc,1.4,1.5
- Index(es):