Fix issue with reshuffles

MattEqualsCoder · MattEqualsCoder · commit 99dabf75ea6a · 2024-03-18T16:50:56.000-04:00
diff --git a/MSURandomizer/MSURandomizer.csproj b/MSURandomizer/MSURandomizer.csproj
@@ -7,7 +7,7 @@
         <ApplicationManifest>app.manifest</ApplicationManifest>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
         <PackageIcon>MSURandomizerIcon.ico</PackageIcon>
-        <Version>2.0.0-rc.1</Version>
+        <Version>2.0.0-rc.2</Version>
         <ApplicationIcon>MSURandomizerIcon.ico</ApplicationIcon>
     </PropertyGroup>
 
diff --git a/MSURandomizer/Services/MsuMonitorWindowService.cs b/MSURandomizer/Services/MsuMonitorWindowService.cs
@@ -62,7 +62,7 @@ public void StartMonitor(Msu? msu = null, MsuType? outputMsuType = null)
                     msuUserOptionsService.MsuUserOptions.SelectedMsus?.Contains(x.Path) == true).ToList();
                 msuMonitorService.StartShuffle(new MsuSelectorRequest()
                 {
-                    EmptyFolder = true,
+                    EmptyFolder = false,
                     Msus = msus,
                     OutputMsuType = outputMsuType,
                     ShuffleStyle = msuUserOptionsService.MsuUserOptions.MsuShuffleStyle,
diff --git a/MSURandomizerLibrary/Services/MsuMonitorService.cs b/MSURandomizerLibrary/Services/MsuMonitorService.cs
@@ -39,6 +39,7 @@ public async Task StartShuffle(MsuSelectorRequest request, int seconds = 60)
         do
         {
             request.CurrentTrack = _currentTrack;
+            request.PrevMsu = _currentMsu;
             var response = msuSelectorService.CreateShuffledMsu(request);
             _currentMsu = response.Msu;
             MsuShuffled?.Invoke(this, EventArgs.Empty);

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void StartMonitor(Msu? msu = null, MsuType? outputMsuType = null)`
`62`	`62`	`msuUserOptionsService.MsuUserOptions.SelectedMsus?.Contains(x.Path) == true).ToList();`
`63`	`63`	`msuMonitorService.StartShuffle(new MsuSelectorRequest()`
`64`	`64`	`{`
`65`		`- EmptyFolder = true,`
	`65`	`+ EmptyFolder = false,`
`66`	`66`	`Msus = msus,`
`67`	`67`	`OutputMsuType = outputMsuType,`
`68`	`68`	`ShuffleStyle = msuUserOptionsService.MsuUserOptions.MsuShuffleStyle,`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public async Task StartShuffle(MsuSelectorRequest request, int seconds = 60)`
`39`	`39`	`do`
`40`	`40`	`{`
`41`	`41`	`request.CurrentTrack = _currentTrack;`
	`42`	`+ request.PrevMsu = _currentMsu;`
`42`	`43`	`var response = msuSelectorService.CreateShuffledMsu(request);`
`43`	`44`	`_currentMsu = response.Msu;`
`44`	`45`	`MsuShuffled?.Invoke(this, EventArgs.Empty);`