Merge branch 'master' of github.com:openzfsonwindows/ZFSin

openzfsonwindows · Feb 6, 2020 · 856b1e2 · 856b1e2
2 parents c713994 + 06c8bf1
commit 856b1e2
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/zfsinstaller/zfsinstaller.cpp b/zfsinstaller/zfsinstaller.cpp
@@ -91,6 +91,8 @@ DWORD zfs_uninstall(char *inf_path)
 
 	ret = send_zfs_ioc_unregister_fs();
 
+	Sleep(2000);
+
 	// 128+2	Always ask the users if they want to reboot.
 	if (ret == 0)
 		ret = executeInfSection("DefaultUninstall 128 ", inf_path);
@@ -221,6 +223,11 @@ DWORD send_zfs_ioc_unregister_fs(void)
 
 	DWORD bytesReturned;
 
+	if (g_fd == INVALID_HANDLE_VALUE) {
+		printf("Unable to open ZFS devnode, already uninstalled?\n");
+		return 0;
+	}
+
 	// We use bytesReturned to hold "zfs_module_busy".
 	BOOL ret = DeviceIoControl(
 		g_fd,