Skip to content

Fix file lock error when saving cropped image on network drives #157

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Slashxdd wants to merge 1 commit into
base: feature/new-webp-decoder
Choose a base branch
from
Open

Fix file lock error when saving cropped image on network drives #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion quick-picture-viewer/forms/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2202,8 +2202,10 @@ public void cropBtn_Click(object sender, EventArgs e)
{
if (selForm != null && originalImage != null)
{
originalImage = originalImage.Clone(GetSelectionRect(), originalImage.PixelFormat);
Bitmap oldImage = originalImage;
originalImage = oldImage.Clone(GetSelectionRect(), oldImage.PixelFormat);
pictureBox.Image = originalImage;
oldImage.Dispose();
setImageChanged(true);
UpdateSizeLabel();
pictureBox.UpdatePictureBoxLocation(picturePanel);
Expand Down
10 changes: 7 additions & 3 deletions quick-picture-viewer/typewrappers/BitmapWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ public override FileTypeMan.OpenResult Open(string path)
{
try
{
return new FileTypeMan.OpenResult
using (var ms = new MemoryStream(File.ReadAllBytes(path)))
using (var tmp = new Bitmap(ms))
{
Bmp = new Bitmap(path)
};
return new FileTypeMan.OpenResult
{
Bmp = new Bitmap(tmp)
};
}
}
catch
{
Expand Down
9 changes: 6 additions & 3 deletions quick-picture-viewer/typewrappers/IcoWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ public override FileTypeMan.OpenResult Open(string path)
{
try
{
return new FileTypeMan.OpenResult
using (var icon = new Icon(path, 128, 128))
{
Bmp = new Icon(path, 128, 128).ToBitmap()
};
return new FileTypeMan.OpenResult
{
Bmp = icon.ToBitmap()
};
}
}
catch
{
Expand Down