From 5b9c5e230e43255a46e0f352e055aa2df097ea74 Mon Sep 17 00:00:00 2001 From: Teo Fonrouge Date: Mon, 20 Oct 2008 17:06:54 +0000 Subject: [PATCH] 2008-10-20 12:06 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com) * source/debug/debugger.prg ! Fixed error when selecting "Restore Settings" and the current prg source is not in the "path for Files" option. (NIL ::oBrwText at line 1478 on debugger.prg) --- harbour/ChangeLog | 6 ++++++ harbour/source/debug/debugger.prg | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 1ddf6376d4..eb19a1b771 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-20 12:06 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com) + * source/debug/debugger.prg + ! Fixed error when selecting "Restore Settings" and the current prg source + is not in the "path for Files" option. (NIL ::oBrwText at line 1478 on + debugger.prg) + 2008-10-20 17:26 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/rtl/filebuf.c ! fixed bad typo in lock table resizing diff --git a/harbour/source/debug/debugger.prg b/harbour/source/debug/debugger.prg index 94921d54e6..be524a82cb 100644 --- a/harbour/source/debug/debugger.prg +++ b/harbour/source/debug/debugger.prg @@ -563,7 +563,7 @@ METHOD BuildCommandWindow() CLASS HBDebugger ::nCommand := 1 nSize := ::oWndCommand:nRight - ::oWndCommand:nLeft - 3 - ::oGet := HbDbInput():new( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3,; + ::oGet := HbDbInput():new( ::oWndCommand:nBottom - 1, ::oWndCommand:nLeft + 3,; nSize, "", __DbgColors()[ 2 ], Max( nSize, 256 ) ) RETURN NIL @@ -1475,7 +1475,9 @@ METHOD HideVars() CLASS HBDebugger nTop := ::oWndPnt:nBottom + 1 ENDIF ::oWndCode:Resize( nTop ) - ::oBrwText:Resize( ::oWndCode:nTop + 1 ) + IF ::oBrwText != NIL + ::oBrwText:Resize( ::oWndCode:nTop + 1 ) + ENDIF IF ::oWndCode:lFocused ::oWndCode:cargo[ 1 ] := Row() ::oWndCode:cargo[ 2 ] := Col()