[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.15,1.16,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv478

Modified Files:
	shellmenu.c 
Log Message:
Added defensive driving in shellhandlemenu for commands that expect a frontmost window to be defined.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shellmenu.c	19 Feb 2006 17:06:38 -0000	1.15
--- shellmenu.c	25 Feb 2006 15:11:57 -0000	1.16
***************
*** 1735,1738 ****
--- 1735,1743 ----
  			short fontnumber;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 				
  			getmenuitem (shellmenuhandle (fontmenu), iditem, bs);
  			
***************
*** 1755,1758 ****
--- 1760,1768 ----
  			short size = 0;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {
  				
***************
*** 1833,1836 ****
--- 1843,1851 ----
  			tyselectioninfo x;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			clearbytes (&x, sizeof (x)); /*set all flags to false*/
  			
***************
*** 1897,1900 ****
--- 1912,1920 ----
  			register tyjustification justification = unknownjustification;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {
  				
***************
*** 1935,1938 ****
--- 1955,1963 ----
  			register short leading = -1;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {