Author: sh-sh-sh Date: Tue Jan 29 20:20:36 2008 New Revision: 43986 URL: http://svn.opensuse.org/viewcvs/yast?rev=43986&view=rev Log: better safe than sorry Modified: trunk/core/libyui/src/YCPEvent.cc Modified: trunk/core/libyui/src/YCPEvent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/libyui/src/YCPEvent.cc?rev=43986&r1=43985&r2=43986&view=diff ============================================================================== --- trunk/core/libyui/src/YCPEvent.cc (original) +++ trunk/core/libyui/src/YCPEvent.cc Tue Jan 29 20:20:36 2008 @@ -44,6 +44,9 @@ YCPValue YCPEvent::eventId() const { + if ( ! _event ) + return YCPVoid(); + // // Widget Events // @@ -121,18 +124,21 @@ { YCPMap map; - map->add( YCPString( "EventType" ), YCPString ( YEvent::toString( _event->eventType() ) ) ); - map->add( YCPString( "EventSerialNo" ), YCPInteger( _event->serial() ) ); + if ( _event ) + { + map->add( YCPString( "EventType" ), YCPString ( YEvent::toString( _event->eventType() ) ) ); + map->add( YCPString( "EventSerialNo" ), YCPInteger( _event->serial() ) ); - YCPValue id = eventId(); + YCPValue id = eventId(); - if ( ! id.isNull() && ! id->isVoid() ) - { - map->add( YCPString( "ID" ), id ); - } + if ( ! id.isNull() && ! id->isVoid() ) + { + map->add( YCPString( "ID" ), id ); + } - addWidgetEventFields( map, id ); - addKeyEventFields ( map, id ); + addWidgetEventFields( map, id ); + addKeyEventFields ( map, id ); + } return map; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org