fix crash when get resource string in background thread

duchuule · Oct 6, 2015 · c2b9ac2 · c2b9ac2
1 parent 95bc35d
commit c2b9ac2
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 86 deletions.
diff --git a/CheatPane.xaml.cpp b/CheatPane.xaml.cpp
@@ -172,7 +172,7 @@ void CheatPane::addButton_Click(Platform::Object^ sender, Windows::UI::Xaml::Rou
 
 bool CheatPane::CheckCodeFormat(Platform::String ^codeText, void(*messageCallback)(Platform::String ^))
 {
-	auto loader =  Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader =  Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 
 	if (codeText == nullptr || codeText->IsEmpty())

diff --git a/DirectXPage.xaml.cpp b/DirectXPage.xaml.cpp
@@ -155,7 +155,7 @@ DirectXPage::DirectXPage():
 	// Declare the top level nav items
 	navlist = ref new Vector<NavMenuItem^>();
 
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 	navlist->Append(
 		ref new NavMenuItem(
 			loader->GetString("HomeText"),

diff --git a/ExportPage.xaml.cpp b/ExportPage.xaml.cpp
@@ -72,7 +72,7 @@ void ExportPage::SignInbtn_Click(Platform::Object^ sender, Windows::UI::Xaml::Ro
 
 void ExportPage::signin_Completed(bool isLoggedIn)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	if (isLoggedIn)
 	{
@@ -136,7 +136,7 @@ void ExportPage::signin_Completed(bool isLoggedIn)
 
 void ExportPage::exportOneDrivebtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	//get a list of rom
 	Vector<Platform::String ^> ^romNames = ref new Vector<Platform::String ^>();

diff --git a/FileBrowserPane.xaml.cpp b/FileBrowserPane.xaml.cpp
@@ -143,7 +143,7 @@ void FileBrowserPane::fileList_SelectionChanged(Platform::Object^ sender, Window
 	if (this->loading)
 		return;
 
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	OneDriveFileItem ^ item = (OneDriveFileItem ^)(this->fileList->SelectedItem);
 	if (item == nullptr)
@@ -339,7 +339,7 @@ task<size_t> FileBrowserPane::DownloadFile(OneDriveFileItem^ item, CreationColli
 
 void FileBrowserPane::closeBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	//check to see if any thing is downloading
 	for (unsigned int i = 0; i < this->fileVector->Size; i++)
@@ -363,7 +363,7 @@ void FileBrowserPane::closeBtn_Click(Platform::Object^ sender, Windows::UI::Xaml
 
 void FileBrowserPane::OnNavigatingFrom(Windows::UI::Xaml::Navigation::NavigatingCancelEventArgs^ e)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	for (unsigned int i = 0; i < this->fileVector->Size; i++)
 	{
@@ -420,7 +420,7 @@ void FileBrowserPane::backBtn_Click(Platform::Object^ sender, Windows::UI::Xaml:
 		return;
 	}
 
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	//check to see if any thing is downloading
 	for (unsigned int i = 0; i < this->fileVector->Size; i++)

diff --git a/HIDGamepadConfig.xaml.cpp b/HIDGamepadConfig.xaml.cpp
@@ -46,7 +46,7 @@ HIDGamepadConfig::HIDGamepadConfig() :
 void HIDGamepadConfig::OnNavigatedTo(NavigationEventArgs^ /* e */)
 {
 	navigatedAway = false;
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 	if (!EventHandlerForDevice::Current->IsDeviceConnected) //connection failed
 	{
 		//this->txtNotification->Visibility = Windows::UI::Xaml::Visibility::Visible;
@@ -231,7 +231,7 @@ void HIDGamepadConfig::OnInputReportEvent(HidDevice^ sender, HidInputReportRecei
 	//check buttons
 	auto bcontrols = inputReport->ActivatedBooleanControls;
 
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	if (configureStage == 0) //record start button and default value of numeric buttons
 	{

diff --git a/HelpPage.xaml.cpp b/HelpPage.xaml.cpp
@@ -40,7 +40,7 @@ HelpPage::HelpPage()
 	auto myPackage = Windows::ApplicationModel::Package::Current;
 	auto version = myPackage->Id->Version;
 
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	versionBlock->Text = loader->GetString("VersionText") + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
 

diff --git a/ImportPage.xaml.cpp b/ImportPage.xaml.cpp
@@ -55,7 +55,7 @@ ImportPage::ImportPage()
 
 void ImportPage::chooseFolderbtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	FolderPicker ^picker = ref new FolderPicker();
 
@@ -264,7 +264,7 @@ void ImportPage::importSavbtn_Click(Platform::Object^ sender, Windows::UI::Xaml:
 
 	picker->ViewMode = PickerViewMode::List;
 	//picker->CommitButtonText = "Select";
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 
 	task<void> t = create_task(picker->PickSingleFileAsync()).then([this, loader](StorageFile ^file)
@@ -354,7 +354,7 @@ void ImportPage::SignInbtn_Click(Platform::Object^ sender, Windows::UI::Xaml::Ro
 
 void ImportPage::signin_Completed(bool isLoggedIn)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	if (isLoggedIn)
 	{

diff --git a/PurchasePage.xaml.cpp b/PurchasePage.xaml.cpp
@@ -70,7 +70,7 @@ void PurchasePage::ButtonBuyNow_Clicked(Platform::Object^ sender, Windows::UI::X
 
 				if (CurrentApp::LicenseInformation->ProductLicenses->Lookup(key)->IsActive)
 				{
-					auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+					auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 					//prompt user to restart app if it's ad removal
 					if (key == "removeads" || key == "noads_premium")
@@ -113,7 +113,7 @@ void PurchasePage::loadProductsBtn_Click(Platform::Object^ sender, Windows::UI::
 	{
 		try
 		{
-			auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+			auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 			ListingInformation^ li = tli.get();
 

diff --git a/SelectFilesPane.xaml.cpp b/SelectFilesPane.xaml.cpp
@@ -42,7 +42,7 @@ SelectFilesPane::SelectFilesPane(IVector<Platform::String^>^ list, Platform::Str
 	{
 		this->fileList->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
 		this->txtNoFile->Visibility = Windows::UI::Xaml::Visibility::Visible;
-		this->txtNoFile->Text = ResourceLoader::GetForCurrentView()->GetString("NoSupportedFileText");
+		this->txtNoFile->Text = ResourceLoader::GetForViewIndependentUse()->GetString("NoSupportedFileText");
 	}
 	initdone = true;
 
@@ -60,15 +60,15 @@ void SelectFilesPane::OkBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::R
 {
 	if (this->fileList->SelectedItems->Size == 0)
 	{
-		MessageDialog ^dialog = ref new MessageDialog(ResourceLoader::GetForCurrentView()->GetString("NoFileSelectedText"));
+		MessageDialog ^dialog = ref new MessageDialog(ResourceLoader::GetForViewIndependentUse()->GetString("NoFileSelectedText"));
 		dialog->ShowAsync();
 		return;
 	}
 
 	this->fileList->Visibility = Windows::UI::Xaml::Visibility::Collapsed;
 	this->txtNoFile->Visibility = Windows::UI::Xaml::Visibility::Visible;
 	this->OkBtn->IsEnabled = false;
-	this->txtNoFile->Text = ResourceLoader::GetForCurrentView()->GetString("ProcessingText");
+	this->txtNoFile->Text = ResourceLoader::GetForViewIndependentUse()->GetString("ProcessingText");
 
 
 	Vector<int>^ selectedIndices = ref new Vector<int>  ();

diff --git a/SelectROMPane.xaml.cpp b/SelectROMPane.xaml.cpp
@@ -302,7 +302,7 @@ void SelectROMPane::saveBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::R
 	}
 	else
 	{
-		auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+		auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 		MessageDialog ^dialog = ref new MessageDialog(loader->GetString("OverwriteSaveConfirmText"),loader->GetString("OverwriteAsk"));
 		UICommand ^confirm = ref new UICommand(loader->GetString("YesText"),
@@ -344,7 +344,7 @@ void SelectROMPane::loadBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::R
 	}
 	else
 	{
-		auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+		auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 
 		MessageDialog ^dialog = ref new MessageDialog(loader->GetString("LoadConfirmPrompt"), loader->GetString("WarningText"));
@@ -381,7 +381,7 @@ void SelectROMPane::loadBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::R
 
 void SelectROMPane::resetBtn_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	MessageDialog ^dialog = ref new MessageDialog(loader->GetString("ResetConfirmPrompt"), loader->GetString("WarningText"));
 	UICommand ^confirm = ref new UICommand(loader->GetString("YesText"),
@@ -500,7 +500,7 @@ void VBA10::SelectROMPane::lbAllROMMainGrid_RightTapped(Platform::Object^ sender
 
 void SelectROMPane::ShowContextMenu(ROMDBEntry^ entry, Windows::Foundation::Rect rect)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	auto menu = ref new PopupMenu();
 	menu->Commands->Append(ref new UICommand(loader->GetString("DeleteText"), ref new UICommandInvokedHandler([this, entry, loader](IUICommand^ command)

diff --git a/SelectStatePane.xaml.cpp b/SelectStatePane.xaml.cpp
@@ -34,7 +34,7 @@ SelectStatePane::SelectStatePane(int selectedSlot):initdone(false)
 
 void SelectStatePane::Init(void)
 {
-	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
+	auto loader = Windows::ApplicationModel::Resources::ResourceLoader::GetForViewIndependentUse();
 
 	this->savestateVector = ref new Platform::Collections::Vector<Platform::String ^>();
 	this->savestateVector->Append(loader->GetString("Savestate0Text"));

diff --git a/SettingsPage.xaml b/SettingsPage.xaml
@@ -36,7 +36,7 @@
                       >
                     <StackPanel Orientation="Vertical" x:Name="InputStackPanel" 
                                   HorizontalAlignment="Left" 
-                                MaxWidth="500"
+                                MaxWidth="440"
                                 Margin="12,0">
                         <StackPanel.Resources>
                             <CollectionViewSource x:Name="vsControllerList"/>
@@ -51,23 +51,28 @@
                                  x:Name="runBuyNotice"/>
                         </TextBlock>
 
-                        <StackPanel Orientation="Horizontal"
-                                    Margin="0,0,0,8"
-                                    x:Name="panelGamepadActivate">
+                        <Grid Margin="0,0,0,8"
+                            x:Name="panelGamepadActivate">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="1*" />
+                                <ColumnDefinition Width="8" />
+                                <ColumnDefinition Width="1*" />
+                            </Grid.ColumnDefinitions>
+
                             <Button x:Name="purchaseBtn" Content="**Buy" 
-                            Click="purchaseBtn_Click"
-                            Width="120"
+                                    Click="purchaseBtn_Click"
                                     x:Uid="BuyBtn"
-                            Margin =" 0, 0, 8, 0"/>
+                                    HorizontalAlignment="Stretch"
+                            />
 
                             <Button x:Name="watchVideoBtn" Content="**Watch Video" 
-                            Width="120"
-                            Margin =" 0, 0, 0, 0" 
-                            Click="watchVideobtn_Click"
-                                    x:Uid="WatchVideoBtn"/>
+                                    Click="watchVideobtn_Click"
+                                    x:Uid="WatchVideoBtn"
+                                    HorizontalAlignment="Stretch"
+                                    Grid.Column="2"/>
 
 
-                        </StackPanel>
+                        </Grid>
 
                         <TextBlock TextWrapping="Wrap" 
                                    Text="txtControllerStatus - set by cpp"
@@ -76,7 +81,13 @@
                                    Margin="0,0,0,8"
                                    >
                         </TextBlock>
-
+
+                        <Button x:Name="ConfigureXboxBtn" Content="**Configure" 
+                                x:Uid="ConfigureBtn"
+                                 HorizontalAlignment="Stretch"
+                                Margin="0,0,0,12"
+                                       />
+
                         <StackPanel x:Name="panelHIDGamepad" >
                             <TextBlock Text="txtHIDGamepad - set by cpp" 
                                        Foreground="Blue"
@@ -100,23 +111,28 @@
                                 </ListBox.ItemTemplate>
                             </ListBox>
 
-                            <StackPanel Orientation="Horizontal"
-                                    Margin =" 0, 0, 0, 12"
+                            <Grid Margin =" 0, 0, 0, 12"
                                         x:Name="panelHIDConnect">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1*" />
+                                    <ColumnDefinition Width="8" />
+                                    <ColumnDefinition Width="1*" />
+                                </Grid.ColumnDefinitions>
+
                                 <Button x:Name="ConfigureBtn" Content="**Configure" 
-                                    Width="120"
-                                    Margin =" 0, 0, 8, 0"
                                         x:Uid="ConfigureBtn"
-                                        Click="ConfigureBtn_Click"/>
+                                        Click="ConfigureBtn_Click"
+                                        HorizontalAlignment="Stretch"
+                                        />
 
-                                    <Button x:Name="ConnectBtn" Content="**Connect" 
-                                            x:Uid="ConnectBtn"
-                                Width="120"
-                                Margin =" 0, 0, 0, 0" 
-                                Click="ConnectBtn_Click"/>
+                                <Button x:Name="ConnectBtn" Content="**Connect" 
+                                        x:Uid="ConnectBtn"
+                                        Click="ConnectBtn_Click"
+                                        HorizontalAlignment="Stretch"
+                                        Grid.Column="2"/>
 
 
-                            </StackPanel>
+                            </Grid>
                         </StackPanel>
 
                         <ComboBox Name="cboTurboBehavior" 
@@ -404,7 +420,7 @@
                       >
                     <StackPanel Orientation="Vertical"
                                   HorizontalAlignment="Left" 
-                                MaxWidth="500"
+                                MaxWidth="440"
                                 Margin="12,0">
                         <!--<ToggleSwitch Toggled="hzToggle_Toggled" Header="30 Hz mode for displays with 30 Hz" Name="hzToggle" IsOn="True" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>-->
 
@@ -571,7 +587,7 @@
                       >
                     <StackPanel Orientation="Vertical"
                                   HorizontalAlignment="Left" 
-                                MaxWidth="500"
+                                MaxWidth="440"
                                 Margin="12,0">