Navigation

Changeset 5774

Timestamp:

11/16/07 16:34:20 (1 year ago)

Author:

vboxsync

Message:

FE/Qt: Fixed a regression (would unregister an inaccessible hard disk even if the user chose Cancel in the confirmation dialog).

Files:

r5763	r5774
186	186	void cannotDeleteHardDiskImage (QWidget *parent, const CVirtualDiskImage &vdi);
187	187
188		~~int~~ confirmHardDiskUnregister (QWidget *parent, const QString &src);
	188	bool confirmHardDiskUnregister (QWidget *parent, const QString &src);
189	189
190	190	void cannotCreateHardDiskImage (

r5763	r5774
1011	1011	}
1012	1012
1013		~~int~~ VBoxProblemReporter::confirmHardDiskUnregister (QWidget *parent,
	1013	bool VBoxProblemReporter::confirmHardDiskUnregister (QWidget *parent,
1014	1014	const QString &src)
1015	1015	{

r5483	r5774
2017	2017	{
2018	2018	type = VBoxDefs::HD;
2019		int deleteImage;
	2019	bool deleteImage = false;
	2020
2020	2021	/// @todo When creation of VMDK is implemented, we should
2021	2022	/// enable image deletion for them as well (use
…	…
2024	2025	if (disk.GetStorageType() == CEnums::VirtualDiskImage &&
2025	2026	item->getStatus() == VBoxMedia::Ok)
2026		deleteImage = vboxProblem().confirmHardDiskImageDeletion (this, src);
	2027	{
	2028	int rc = vboxProblem().confirmHardDiskImageDeletion (this, src);
	2029	if (rc == QIMessageBox::Cancel)
	2030	return;
	2031	deleteImage = rc == QIMessageBox::Yes;
	2032	}
2027	2033	else
2028		deleteImage = vboxProblem().confirmHardDiskUnregister (this, src);
2029		if (deleteImage == QIMessageBox::Cancel)
2030		return;
	2034	{
	2035	if (!vboxProblem().confirmHardDiskUnregister (this, src))
	2036	return;
	2037	}
	2038
2031	2039	CHardDisk hd = vbox.UnregisterHardDisk (uuid);
2032		if (vbox.isOk() && deleteImage == QIMessageBox::Yes)
	2040	if (!vbox.isOk())
	2041	vboxProblem().cannotUnregisterMedia (this, vbox, type, src);
	2042	else if (deleteImage)
2033	2043	{
2034	2044	/// @todo When creation of VMDK is implemented, we should