diff --git a/FModel/Creator/Creator.cs b/FModel/Creator/Creator.cs
index c9f2f52c..d1b78fbf 100644
--- a/FModel/Creator/Creator.cs
+++ b/FModel/Creator/Creator.cs
@@ -392,24 +392,19 @@ namespace FModel.Creator
{
icon.Draw(c);
}
- else
- {
- if ((EIconDesign) Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoBackground)
- {
- Rarity.DrawRarity(c, icon);
- }
+ else if ((EIconDesign) Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoBackground)
+ {
+ Rarity.DrawRarity(c, icon);
}
LargeSmallImage.DrawPreviewImage(c, icon);
- if ((EIconDesign) Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoBackground)
+ if ((EIconDesign) Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoBackground &&
+ (EIconDesign)Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoText)
{
- if ((EIconDesign) Properties.Settings.Default.AssetsIconDesign != EIconDesign.NoText)
- {
- Text.DrawBackground(c, icon);
- Text.DrawDisplayName(c, icon);
- Text.DrawDescription(c, icon);
- }
+ Text.DrawBackground(c, icon);
+ Text.DrawDisplayName(c, icon);
+ Text.DrawDescription(c, icon);
}
Watermark.DrawWatermark(c); // watermark should only be applied on icons with width = 512
diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 0b5f7e10..e49c0c11 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -21,6 +21,7 @@
+
@@ -30,6 +31,7 @@
+
@@ -91,6 +93,9 @@
+
diff --git a/FModel/Windows/Settings/General.xaml.cs b/FModel/Windows/Settings/General.xaml.cs
index 82bab26e..948c26e0 100644
--- a/FModel/Windows/Settings/General.xaml.cs
+++ b/FModel/Windows/Settings/General.xaml.cs
@@ -49,9 +49,9 @@ namespace FModel.Windows.Settings
if (_useDiscordRpc && !Properties.Settings.Default.UseDiscordRpc) // previously enabled
DiscordIntegration.Deinitialize();
- if (Properties.Settings.Default.AssetsLanguage != Languages_CbBox.SelectedIndex)
+ if (Languages_CbBox.SelectedIndex > -1 && Languages_CbBox.SelectedItem is ComboBoxViewModel cb && cb.Id != Properties.Settings.Default.AssetsLanguage)
{
- Properties.Settings.Default.AssetsLanguage = Languages_CbBox.SelectedIndex;
+ Properties.Settings.Default.AssetsLanguage = cb.Id;
await Localizations.SetLocalization(Properties.Settings.Default.AssetsLanguage, true).ConfigureAwait(false);
}
if (Properties.Settings.Default.AssetsJsonType != Json_CbBox.SelectedIndex)