Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Time: Fix flattening of countries with one subitem and no timezone on the parent.

Browse Source 
Fixes #15907.

Change-Id: I10d81ca92539b3430607c10ebaa9fe7f1080ef0b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2517
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
José Manuel Ferrer Ortiz 2020-04-26 13:51:07 +02:00 committed by waddlesplash
parent 6f9f7e02a8
commit ffbe5ecde2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/preferences/time/ZoneView.cpp
View File

@ -441,9 +441,10 @@ TimeZoneView::_BuildZoneMenu()
zoneIter->second->SetCountry(currentItem->HasCountry()
? new(std::nothrow) BCountry(currentItem->Country())
: NULL);
zoneIter->second->SetTimeZone(currentItem->HasTimeZone()
? new(std::nothrow) BTimeZone(currentItem->TimeZone())
: NULL);
if (currentItem->HasTimeZone()) {
zoneIter->second->SetTimeZone(new(std::nothrow)
BTimeZone(currentItem->TimeZone()));
}
zoneIter->second->SetOutlineLevel(1);
delete currentItem;
}