Re-enable a hack in main.c to fix a "clobbered" pointer; this is
NOT a fix. Work continues...
This commit is contained in:
+10
-4
@@ -633,12 +633,18 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
timer++;
|
timer++;
|
||||||
|
|
||||||
// this line's here because s was getting overwritten at one time...
|
// this is here because s is getting overwritten...
|
||||||
//s = screenlist_current();
|
//if (s != screenlist_current()) {
|
||||||
|
// syslog(LOG_DEBUG, "internal error! s was found overwritten at main.c:637");
|
||||||
|
s = screenlist_current();
|
||||||
|
//}
|
||||||
|
//
|
||||||
|
//TODO: THIS MUST BE FIXED..... WHY is s getting overwritten?
|
||||||
|
// s is a local, it is never passed or assigned to anywhere.
|
||||||
|
// So SOMETHING is going haywire and clobbering memory....
|
||||||
|
|
||||||
if (s && (timer >= s->duration)) {
|
if (s && (timer >= s->duration))
|
||||||
screenlist_next ();
|
screenlist_next ();
|
||||||
}
|
|
||||||
|
|
||||||
// Just in case it gets out of hand...
|
// Just in case it gets out of hand...
|
||||||
if (timer >= MAX_TIMER)
|
if (timer >= MAX_TIMER)
|
||||||
|
|||||||
Reference in New Issue
Block a user