Merge pull request LykosAI#954 from ionite34/fix-crashes

Fix crashes

(cherry picked from commit 74842d7)

# Conflicts:
#	CHANGELOG.md

Author: mohnjiles

Avalonia.Gif/WebpInstance.cs

@@ -54,14 +54,18 @@ public WebpInstance(Stream currentStream)
 
         var pixSize = new PixelSize(_codec.Info.Width, _codec.Info.Height);
 
-        _targetBitmap = new WriteableBitmap(pixSize, new Vector(96, 96), PixelFormat.Bgra8888, AlphaFormat.Opaque);
+        _targetBitmap = new WriteableBitmap(
+            pixSize,
+            new Vector(96, 96),
+            PixelFormat.Bgra8888,
+            AlphaFormat.Opaque
+        );
         GifPixelSize = pixSize;
 
         _totalTime = TimeSpan.Zero;
 
         _frameTimes = _codec
-            .FrameInfo
-            .Select(frame =>
+            .FrameInfo.Select(frame =>
             {
                 _totalTime = _totalTime.Add(TimeSpan.FromMilliseconds(frame.Duration));
                 return _totalTime;

CHANGELOG.md

@@ -5,15 +5,48 @@ All notable changes to Stability Matrix will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning 2.0](https://semver.org/spec/v2.0.0.html).
 
+<<<<<<< HEAD
+=======
+## v2.14.0-dev.2
+### Fixed
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+
+## v2.14.0-dev.1
+### Added
+- Added Rescale CFG addon to Inference
+- Added Swap Dimensions button between the width/height input in Inference
+- Added Ctrl+Tab/Ctrl+Shift+Tab shortcuts for navigating between Inference tabs
+- Added OpenModelDB tab to the Model Browser
+### Changed
+- Improved the quality of Inference inpainting by upgrading the workflow behind the scenes. The workflow remains the same for you — just better results!
+- Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
+- "Clear All" button will now remain at the top of the Downloads list regardless of scroll position - thanks to @Genteure!
+- Improved image metadata parsing - thanks to @Genteure!
+### Fixed
+- Fixed Inference image selector card buttons taking up the whole height of the card
+- Fixed Inference mask editor failing to paint to the right-most edge on large images
+- Fixed Inference mask editor not showing the entire image in certain circumstances
+- Fixed an issue where certain sampler/scheduler combos would not get saved in image metadata - thanks to @yansigit!
+- Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
+- Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
+### Supporters
+#### Visionaries
+- Many thanks to our incredible Visionary-tier Patreon supporters, **Waterclouds** and **TheTekknician**! Your support helps us continue to improve Stability Matrix!
+
+>>>>>>> 74842d71 (Merge pull request #954 from ionite34/fix-crashes)
 ## v2.13.1
 ### Changed
 - Redesigned the Checkpoint Manager Filter flyout to include more options and improve the layout
 ### Fixed
 - Fixed [#1078](https://github.com/LykosAI/StabilityMatrix/issues/1078) - "Call from invalid thread" error after one-click install finishes
 - Fixed [#1080](https://github.com/LykosAI/StabilityMatrix/issues/1080) - Some models not displayed in Checkpoint Manager
 - Fixed Inference image selector card buttons taking up the whole height of the card
+<<<<<<< HEAD
 - Fixed Inference mask editor failing to paint to the right-most edge on large images
 - Fixed Inference mask editor not showing the entire image in certain circumstances
+=======
+- Fixed crash when dragging & dropping images in Inference (hopefully)
+>>>>>>> 74842d71 (Merge pull request #954 from ionite34/fix-crashes)
 
 ## v2.13.0
 ### Added

StabilityMatrix.Avalonia/Models/ImageSource.cs

@@ -277,7 +277,7 @@ protected virtual void Dispose(bool disposing)
         if (!disposing)
             return;
 
-        Bitmap?.Dispose();
+        Bitmap = null;
     }
 
     /// <inheritdoc />

StabilityMatrix.Avalonia/ViewModels/Base/InferenceGenerationViewModelBase.cs

@@ -421,7 +421,7 @@ await notificationService.ShowAsync(
 
             // Clear progress
             OutputProgress.ClearProgress();
-            ImageGalleryCardViewModel.PreviewImage?.Dispose();
+            // ImageGalleryCardViewModel.PreviewImage?.Dispose();
             ImageGalleryCardViewModel.PreviewImage = null;
             ImageGalleryCardViewModel.IsPreviewOverlayEnabled = false;
 

StabilityMatrix.Avalonia/ViewModels/Inference/ImageGalleryCardViewModel.cs

@@ -88,7 +88,7 @@ public void SetPreviewImage(byte[] imageBytes)
             PreviewImage = bitmap;
             IsPreviewOverlayEnabled = true;
 
-            currentImage?.Dispose();
+            // currentImage?.Dispose();
         });
     }
 

StabilityMatrix.Avalonia/ViewModels/Inference/SelectImageCardViewModel.cs

@@ -295,6 +295,6 @@ private void LoadUserImage(ImageSource image)
 
         ImageSource = image;
 
-        current?.Dispose();
+        // current?.Dispose();
     }
 }