fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-03-18 23:06 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbqt/qtcore/hbqt_hbqevents.cpp
  * contrib/hbqt/qtcore/hbqt_hbqslots.cpp
  * contrib/hbqt/qtcore/hbqt_misc.prg
  * contrib/hbqt/qtgui/hbqt_init.cpp
    ! FIXED: GPF at exit and sometimes along running application.
             Harbourearns, it is day to cheer.
This commit is contained in:
Pritpal Bedi
2011-03-19 06:10:29 +00:00
parent 7e0338c588
commit 5275f128cd
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -16,6 +16,14 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-03-18 23:06 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/qtcore/hbqt_hbqevents.cpp
* contrib/hbqt/qtcore/hbqt_hbqslots.cpp
* contrib/hbqt/qtcore/hbqt_misc.prg
* contrib/hbqt/qtgui/hbqt_init.cpp
! FIXED: GPF at exit and sometimes along running application.
Harbourearns, it is day to cheer.
2011-03-19 06:59 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/filesys.c
! added protection for potentially unfinished due to signal

8
harbour/contrib/hbqt/qtcore/hbqt_hbqevents.cpp
View File

@@ -295,9 +295,11 @@ HB_FUNC( __HBQT_EVENTS_DISCONNECT )
{
object->setProperty( prop, QVariant() );
hb_itemRelease( t_events->listBlock.at( i - 1 ) );
t_events->listBlock[ i - 1 ] = NULL;
if( t_events->listBlock[ i - 1 ] != NULL )
{
hb_itemRelease( t_events->listBlock.at( i - 1 ) );
t_events->listBlock[ i - 1 ] = NULL;
}
nResult = 0;
HB_TRACE( HB_TR_DEBUG, ( " QT_EVENTS_DISCONNECT: %i", type ) );

8
harbour/contrib/hbqt/qtcore/hbqt_hbqslots.cpp
View File

@@ -315,9 +315,11 @@ HB_FUNC( __HBQT_SLOTS_DISCONNECT )
else
nResult = 4;
hb_itemRelease( t_slots->listBlock.at( i - 1 ) );
t_slots->listBlock[ i - 1 ] = NULL;
if( t_slots->listBlock.at( i - 1 ) != NULL )
{
hb_itemRelease( t_slots->listBlock.at( i - 1 ) );
t_slots->listBlock[ i - 1 ] = NULL;
}
}
else
nResult = 3;

2
harbour/contrib/hbqt/qtcore/hbqt_misc.prg
View File

@@ -129,6 +129,8 @@ STATIC FUNCTION HBQEventsFromPointer( ... )
NEXT
RETURN HB_HBQEvents():fromPointer( ... )
/*----------------------------------------------------------------------*/
METHOD HbQtObjectHandler:connect( cnEvent, bBlock )
LOCAL nResult

7
harbour/contrib/hbqt/qtgui/hbqt_init.cpp
View File

@@ -628,7 +628,7 @@ static void hbqt_lib_init( void * cargo )
hb_errInternal( 11001, "hbqt_lib_init(): HBQTGUI Initilization Error.", NULL, NULL );
hb_cmdargInit( s_argc, s_argv );
HB_TRACE( HB_TR_ALWAYS, ( "hbqt_lib_init %p", s_app ) );
HB_TRACE( HB_TR_DEBUG, ( "hbqt_lib_init %p", s_app ) );
hbqt_registerCallbacks();
}
@@ -636,11 +636,6 @@ static void hbqt_lib_init( void * cargo )
static void hbqt_lib_exit( void * cargo )
{
HB_SYMBOL_UNUSED( cargo );
HB_TRACE( HB_TR_ALWAYS, ( "hbqt_lib_exit 0" ) );
s_app->exit( 0 );
HB_TRACE( HB_TR_ALWAYS, ( "hbqt_lib_exit 1" ) );
delete s_app;
HB_TRACE( HB_TR_ALWAYS, ( "hbqt_lib_exit 2" ) );
}