napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[locale] Avoid crashes in the map widget if there is no current location

Browse Source
This commit is contained in:
Adriaan de Groot 2020-07-22 16:55:55 +02:00
parent 42331f6e13
commit 4f684be83d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/locale/timezonewidget/timezonewidget.cpp
View File

@ -94,11 +94,18 @@ TimeZoneWidget::setCurrentLocation( const CalamaresUtils::Locale::TZZone* locati
//### Private
//###
struct PainterEnder
{
QPainter& p;
~PainterEnder() { p.end(); }
};
void
TimeZoneWidget::paintEvent( QPaintEvent* )
{
QFontMetrics fontMetrics( font );
QPainter painter( this );
PainterEnder painter_end { painter };
painter.setRenderHint( QPainter::Antialiasing );
painter.setFont( font );
@ -109,6 +116,11 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
// Draw zone image
painter.drawImage( 0, 0, currentZoneImage );
if ( !m_currentLocation )
{
return;
}
#ifdef DEBUG_TIMEZONES
QPoint point = getLocationPosition( m_currentLocation );
// Draw latitude lines
@ -168,8 +180,6 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
painter.setPen( Qt::white );
painter.drawText( rect.x() + 5, rect.bottom() - 4, m_currentLocation ? m_currentLocation->tr() : QString() );
#endif
painter.end();
}