Skip to content

Commit b0e6280

Browse files
committed
Fix Undo/Redo+Save crashing
1 parent e753145 commit b0e6280

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Canvas.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,12 +261,12 @@ public virtual void ProcessTasks()
261261
BlueMap();
262262
}
263263

264-
if (taskManager.Pop(EditorTasks.PaintingUndo, out task))
264+
if (taskManager.Pop(EditorTasks.Undo, out task))
265265
{
266266
Undo();
267267
}
268268

269-
if (taskManager.Pop(EditorTasks.PaintingRedo, out task))
269+
if (taskManager.Pop(EditorTasks.Redo, out task))
270270
{
271271
Redo();
272272
}

FileManager.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ public bool SaveFileAs()
509509

510510
filesaved = true;
511511
var splittedFileName = fbd.FileName.Split('\\');
512+
LoadedMapPath = String.Join('\\', splittedFileName.Take(splittedFileName.Length - 1));
512513
LoadedMapName = splittedFileName.Last();
513514
FilenameUpdated = true;
514515
}

Game1.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace FFRMapEditorMono
1515
public class Game1 : Game
1616
{
1717
// Set mode to switch between FFR or FFMQ editing mode
18-
private GameMode gameMode = GameMode.FFMQ;
18+
private GameMode gameMode = GameMode.FFR;
1919
private GraphicsDeviceManager _graphics;
2020
private SpriteBatch _spriteBatch;
2121

InfoWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public InfoWindow(Texture2D _window, SpriteFont _font, Texture2D _buttonTexture,
3232
windowWidth = 28 * 8;
3333
okButton = new(_font, "OK", _buttonTexture, new() { new EditorTask(EditorTasks.ToggleInfoWindow, 10) });
3434

35-
windowText = "FFR Map Editor v1.05\n\n" +
35+
windowText = "FFR Map Editor v1.06\n\n" +
3636
"Main Developer\n wildham\n\n" +
3737
"Icons Designer\n DarkmoonEX\n\n" +
3838
"Based on the work of\n" +

0 commit comments

Comments
 (0)