DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes a bug: currency converter never shows error message for service failures (#1799)

Browse Source 
* check status before registering callback

* optimize the style for error msg
This commit is contained in:
Tian L 2022-02-18 21:57:24 +08:00 committed by GitHub
parent d1464a171c
commit 72860fe494
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
View File

@ -188,10 +188,9 @@ void CurrencyDataLoader::ResetLoadStatus()
#pragma optimize("", off) // Turn off optimizations to work around DevDiv 393321 #pragma optimize("", off) // Turn off optimizations to work around DevDiv 393321
void CurrencyDataLoader::LoadData() void CurrencyDataLoader::LoadData()
{ {
RegisterForNetworkBehaviorChanges();
if (!LoadFinished()) if (!LoadFinished())
{ {
RegisterForNetworkBehaviorChanges();
create_task([this]() -> task<bool> { create_task([this]() -> task<bool> {
vector<function<future<bool>()>> loadFunctions = { vector<function<future<bool>()>> loadFunctions = {
[this]() { return TryLoadDataFromCacheAsync(); }, [this]() { return TryLoadDataFromCacheAsync(); },

3
src/Calculator/Views/UnitConverter.xaml
View File

@ -673,9 +673,8 @@
</ResourceDictionary> </ResourceDictionary>
</HyperlinkButton.Resources> </HyperlinkButton.Resources>
</HyperlinkButton> </HyperlinkButton>
<TextBlock Margin="3,7,0,0" Style="{ThemeResource CaptionTextBlockStyle}"> <TextBlock Margin="3,6,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
<Run x:Name="CurrencySecondaryStatus" <Run x:Name="CurrencySecondaryStatus"
FontWeight="SemiBold"
Text=""/> Text=""/>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>