fixed merge conflict

d2phap · Nov 16, 2019 · 9c51ff9 · 9c51ff9
1 parent 6ce677d
commit 9c51ff9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Source/ImageGlass/frmMain.cs b/Source/ImageGlass/frmMain.cs
@@ -2913,7 +2913,7 @@ private void frmMain_Activated(object sender, EventArgs e)
                 // Update ZoomLevels
                 picMain.ZoomLevels = new ImageBoxZoomLevelCollection(Configs.ZoomLevels);
 
-                ApplyZoomMode(GlobalSetting.ZoomMode);
+                ApplyZoomMode(Configs.ZoomMode);
 
                 #endregion