i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accidentially removed one preparation/cancellation too many. Added it back

Browse Source 
but cancel only if preparing was successful.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26463 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-07-17 00:32:26 +00:00
parent a9cc6c1e3d
commit 2570af9d13
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/drivesetup/MainWindow.cpp
+3
View File
@@ -505,6 +505,7 @@ fSurfaceTestMI->SetEnabled(false);
parentPartition = disk->FindDescendant(parentID); parentPartition = disk->FindDescendant(parentID);
if (parentPartition) { if (parentPartition) {
bool prepared = disk->PrepareModifications() == B_OK;
fCreateMenu->SetEnabled(true); fCreateMenu->SetEnabled(true);
BString supportedChildType; BString supportedChildType;
int32 cookie = 0; int32 cookie = 0;
@@ -522,6 +523,8 @@ fSurfaceTestMI->SetEnabled(false);
if (fCreateMenu->CountItems() == 0) if (fCreateMenu->CountItems() == 0)
fprintf(stderr, "Failed to get supported child types: %s\n", fprintf(stderr, "Failed to get supported child types: %s\n",
strerror(ret)); strerror(ret));
if (prepared)
disk->CancelModifications();
} else { } else {
fCreateMenu->SetEnabled(false); fCreateMenu->SetEnabled(false);
} }