From 2570af9d131138cb4f80f56f153b9bace61b5f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= <superstippi@gmx.de>
Date: Thu, 17 Jul 2008 00:32:26 +0000
Subject: [PATCH] Accidentially removed one preparation/cancellation too many.
 Added it back but cancel only if preparing was successful.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26463 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/drivesetup/MainWindow.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 191383f4e4..afbb6f92d5 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -505,6 +505,7 @@ fSurfaceTestMI->SetEnabled(false);
 			parentPartition = disk->FindDescendant(parentID);
 
 		if (parentPartition) {
+			bool prepared = disk->PrepareModifications() == B_OK;
 			fCreateMenu->SetEnabled(true);
 			BString supportedChildType;
 			int32 cookie = 0;
@@ -522,6 +523,8 @@ fSurfaceTestMI->SetEnabled(false);
 			if (fCreateMenu->CountItems() == 0)
 				fprintf(stderr, "Failed to get supported child types: %s\n",
 					strerror(ret));
+			if (prepared)
+				disk->CancelModifications();
 		} else {
 			fCreateMenu->SetEnabled(false);
 		}