📂 v3.1.1

Added:
- Open folder option (Ctrl+Shift+O)

Changes:
- New hotkey for "Open folder recursively": Alt+O

Fixed:
- App crashes if a corrupted file is first in the folder
- App hangs if a previous file is corrupted
- Error on "Save as" if this file is currently opened
- App hangs if trying to open multiple corrupted files in a row

Author: Beelink

.vs/quick-picture-viewer/v16/.suo

@@ -1,5 +1,5 @@
 #define MyAppName "Quick Picture Viewer"
-#define MyAppVersion "3.1.0"
+#define MyAppVersion "3.1.1"
 #define MyAppPublisher "Module Art"
 #define MyAppURL "https://moduleart.github.io/quick-picture-viewer"
 #define MyAppExeName "quick-picture-viewer.exe"
@@ -196,14 +196,4 @@ Root: HKCR; Subkey: "PsdImg\shell\open\command"; ValueType: string; ValueName: "
 Root: HKCR; Subkey: ".cr2"; ValueType: string; ValueName: ""; ValueData: "Cr2Img"; Flags: uninsdeletevalue
 Root: HKCR; Subkey: "Cr2Img"; ValueType: string; ValueName: ""; ValueData: "CR2 image (Canon Digital Camera Raw)"; Flags: uninsdeletekey
 Root: HKCR; Subkey: "Cr2Img\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\icons\cr2.ico"
-Root: HKCR; Subkey: "Cr2Img\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
-
-
-
-
-
-; ICO fix
-Root: HKCR; Subkey: ".ico"; ValueType: none; ValueName: ""; ValueData: "IcoImg"; Flags: deletevalue
-Root: HKCR; Subkey: "IcoImg"; ValueType: none; ValueName: ""; ValueData: "ICO image (Icons file)"; Flags: deletevalue
-Root: HKCR; Subkey: "IcoImg\DefaultIcon"; ValueType: none; ValueName: ""; ValueData: "{app}\icons\ico.ico"; Flags: deletevalue;
-Root: HKCR; Subkey: "IcoImg\shell\open\command"; ValueType: none; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""; Flags: deletevalue
+Root: HKCR; Subkey: "Cr2Img\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""

inno-setup/MSIX/43822ModuleArt.QuickPictureViewer_3.1.1.0_x64__1zwdgyrh74nq4.msix

@@ -1,15 +1,14 @@
 using Microsoft.WindowsAPICodePack.Dialogs;
-using QuickLibrary;
 
 namespace quick_picture_viewer
 {
 	class CustomOpenFolderDialog
 	{
-		public static string GetFolder()
+		public static string GetFolder(string title)
 		{
 			CommonOpenFileDialog dialog = new CommonOpenFileDialog();
 			dialog.IsFolderPicker = true;
-			dialog.Title = LangMan.Get("open-recursive");
+			dialog.Title = title;
 			if (dialog.ShowDialog() == CommonFileDialogResult.Ok)
 			{
 				string p = dialog.FileName;

inno-setup/QuickPictureViewer-Setup.exe

@@ -200,6 +200,7 @@ private void InitLanguage()
 
 			openBtn.Text = LangMan.Get("open");
 			openFileBtn.Text = LangMan.Get("open-file");
+			openFolderBtn.Text = LangMan.Get("open-folder");
 			openRecursive.Text = LangMan.Get("open-recursive");
 
 			saveAsButton.Text = LangMan.Get("save-as") + " | Ctrl+S";
@@ -351,7 +352,7 @@ private void showTypeOpsButton(bool show, string type = null)
 			}));
 		}
 
-		private void openFile(string path)
+		private void openFile(string path, bool goPrev = false)
 		{
 			try
 			{
@@ -435,25 +436,23 @@ private void openFile(string path)
 				}
 				else
 				{
-					if (ext == ".gif")
-					{
-						openImage(new Bitmap(path), Path.GetDirectoryName(path), Path.GetFileName(path));
-					}
-					else
-					{
-						using (Image img = Image.FromFile(path, true))
-						{
-							openImage(new Bitmap(path), Path.GetDirectoryName(path), Path.GetFileName(path));
-						}
-					}
+					openImage(new Bitmap(path), Path.GetDirectoryName(path), Path.GetFileName(path));
 				}
 
 				if (!showTypeOps) showTypeOpsButton(false);
 			}
 			catch
 			{
-				if (NextFile(true) > 1) showSuggestion(LangMan.Get("unable-open-file-skipped") + ": " + Path.GetFileName(path), SuggestionIcon.Next);
-				else showSuggestion(LangMan.Get("unable-open-file") + ": " + Path.GetFileName(path), SuggestionIcon.Warning);
+				if (goPrev)
+				{
+					if (PrevFile(true) > 1) showSuggestion(LangMan.Get("unable-open-file-skipped") + ": " + Path.GetFileName(path), SuggestionIcon.Prev);
+					else showSuggestion(LangMan.Get("unable-open-file") + ": " + Path.GetFileName(path), SuggestionIcon.Warning);
+				}
+				else
+				{
+					if (NextFile(true) > 1) showSuggestion(LangMan.Get("unable-open-file-skipped") + ": " + Path.GetFileName(path), SuggestionIcon.Next);
+					else showSuggestion(LangMan.Get("unable-open-file") + ": " + Path.GetFileName(path), SuggestionIcon.Warning);
+				}
 			}
 		}
 
@@ -886,37 +885,59 @@ private void saveAsButton_Click(object sender, EventArgs e)
 
 			if (saveFileDialog1.ShowDialog() == DialogResult.OK)
 			{
-				FileStream fs = (FileStream)saveFileDialog1.OpenFile();
-				switch (saveFileDialog1.FilterIndex)
+				using (Bitmap bmpToSave = new Bitmap(originalImage))
 				{
-					case 1:
-						originalImage.Save(fs, ImageFormat.Png);
-						break;
-					case 2:
-						originalImage.Save(fs, ImageFormat.Jpeg);
-						break;
-					case 3:
-						originalImage.Save(fs, ImageFormat.Gif);
-						break;
-					case 4:
-						originalImage.Save(fs, ImageFormat.Bmp);
-						break;
-					case 5:
-						originalImage.Save(fs, ImageFormat.Tiff);
-						break;
-					case 6:
-						IcoWrapper.ConvertToIcon(originalImage, fs);
-						break;
-					case 7:
-						using (WebP webp = new WebP())
+					originalImage.Dispose();
+					originalImage = null;
+					pictureBox.Image.Dispose();
+					pictureBox.Image = null;
+
+					using (MemoryStream memory = new MemoryStream())
+					{
+						using (FileStream fs = new FileStream(saveFileDialog1.FileName, FileMode.OpenOrCreate, FileAccess.ReadWrite))
 						{
-							byte[] rawWebP = webp.EncodeLossy(originalImage);
-							fs.Write(rawWebP, 0, rawWebP.Length);
+							byte[] bytes;
+							switch (saveFileDialog1.FilterIndex)
+							{
+								case 1:
+									bmpToSave.Save(memory, ImageFormat.Png);
+									bytes = memory.ToArray();
+									fs.Write(bytes, 0, bytes.Length);
+									break;
+								case 2:
+									bmpToSave.Save(memory, ImageFormat.Jpeg);
+									bytes = memory.ToArray();
+									fs.Write(bytes, 0, bytes.Length);
+									break;
+								case 3:
+									bmpToSave.Save(memory, ImageFormat.Gif);
+									bytes = memory.ToArray();
+									fs.Write(bytes, 0, bytes.Length);
+									break;
+								case 4:
+									bmpToSave.Save(memory, ImageFormat.Bmp);
+									bytes = memory.ToArray();
+									fs.Write(bytes, 0, bytes.Length);
+									break;
+								case 5:
+									bmpToSave.Save(memory, ImageFormat.Tiff);
+									bytes = memory.ToArray();
+									fs.Write(bytes, 0, bytes.Length);
+									break;
+								case 6:
+									IcoWrapper.ConvertToIcon(bmpToSave, memory);
+									break;
+								case 7:
+									using (WebP webp = new WebP())
+									{
+										bytes = webp.EncodeLossy(bmpToSave);
+										fs.Write(bytes, 0, bytes.Length);
+									}
+									break;
+							}
 						}
-						break;
+					}
 				}
-				fs.Close();
-
 				setImageChanged(false);
 				CheckRecursiveFolder(saveFileDialog1.FileName);
 				openFile(saveFileDialog1.FileName);
@@ -1271,6 +1292,8 @@ public int NextFile(bool skipNextFile = false)
 			else
 			{
 				if (skipNextFile) currentIndex++;
+				if (currentIndex > filePaths.Length - 1) currentIndex = 0;
+				if (skipNextFile) currentFile = Path.GetFileName(filePaths[currentIndex]);
 				openFile(currentIndex == filePaths.Length - 1 ? filePaths[0] : filePaths[currentIndex + 1]);
 				return filePaths.Length;
 			}
@@ -1281,7 +1304,7 @@ private void nextButton_Click(object sender, EventArgs e)
 			NextFile();
 		}
 
-		public void PrevFile()
+		public int PrevFile(bool skipPrevFile = false)
 		{
 			string[] filePaths = GetCurrentFiles();
 
@@ -1295,8 +1318,20 @@ public void PrevFile()
 				}
 			}
 
-			if (currentIndex == -1) showSuggestion(LangMan.Get("cur-file-not-found"), SuggestionIcon.Warning);
-			else openFile(currentIndex == 0 ? filePaths[filePaths.Length - 1] : filePaths[currentIndex - 1]);
+			if (currentIndex == -1)
+			{
+				setSlideshow(false);
+				showSuggestion(LangMan.Get("cur-file-not-found"), SuggestionIcon.Warning);
+				return 0;
+			}
+			else
+			{
+				if (skipPrevFile) currentIndex--;
+				if (currentIndex < 0) currentIndex = filePaths.Length - 1;
+				if (skipPrevFile) currentFile = Path.GetFileName(filePaths[currentIndex]);
+				openFile(currentIndex == 0 ? filePaths[filePaths.Length - 1] : filePaths[currentIndex - 1], true);
+				return filePaths.Length;
+			}
 		}
 
 		private void prevButton_Click(object sender, EventArgs e)
@@ -1450,6 +1485,7 @@ private void SetDarkMode(bool dark)
 
 				openBtn.Image = Properties.Resources.white_open;
 				openFileBtn.Image = Properties.Resources.white_imgfile;
+				openFolderBtn.Image = Properties.Resources.white_picfolder;
 				openRecursive.Image = Properties.Resources.white_recursive;
 
 				saveAsButton.Image = Properties.Resources.white_saveas;
@@ -1665,7 +1701,8 @@ public enum SuggestionIcon
 			Slideshow = 3,
 			Fullscreen = 4,
 			Next = 5,
-			Trash = 6
+			Prev = 6,
+			Trash = 7
 		}
 
 		public void showSuggestion(string text, SuggestionIcon icon)
@@ -1691,6 +1728,9 @@ public void showSuggestion(string text, SuggestionIcon icon)
 					case SuggestionIcon.Next:
 						suggestionIcon.Image = Properties.Resources.white_next;
 						break;
+					case SuggestionIcon.Prev:
+						suggestionIcon.Image = Properties.Resources.white_prev;
+						break;
 					case SuggestionIcon.Trash:
 						suggestionIcon.Image = Properties.Resources.white_trash;
 						break;
@@ -2152,7 +2192,7 @@ private void openFileBtn_Click(object sender, EventArgs e)
 		private void openRecursive_Click(object sender, EventArgs e)
 		{
 			setSlideshow(false);
-			string p = CustomOpenFolderDialog.GetFolder();
+			string p = CustomOpenFolderDialog.GetFolder(LangMan.Get("open-recursive"));
 			if (p != null)
 			{
 				recursiveFolder = p;
@@ -2453,5 +2493,16 @@ private void permDeleteBtn_Click(object sender, EventArgs e)
 				}
 			}
 		}
+
+		private void openFolderBtn_Click(object sender, EventArgs e)
+		{
+			setSlideshow(false);
+			string p = CustomOpenFolderDialog.GetFolder(LangMan.Get("open-folder"));
+			if (p != null) 
+			{
+				recursiveFolder = null;
+				openFirstFileInFolder(p); 
+			}
+		}
 	}
 }