--- trunk/installer-simple/bin/installer.sh.in	2016/02/03 11:00:35	2930
+++ trunk/installer-simple/bin/installer.sh.in	2016/02/03 13:57:02	2937
@@ -622,24 +622,28 @@
 	messagebox -y 12 -h $"Detected hardware:" "${message}"
 }
 
+task_select_target_hdd()
+{
+	if [[ -z ${ALL_DISKS} ]]
+	then
+		dialog_no_harddrive_found
+		exit 1
+	else
+		export HDD=$(dialog_select_target_harddrive)
+	fi
+}
+
 task_setup_hdd_partitions()
 {
-	local i
 	local retval
 
-	if [[ -z ${ALL_DISKS} ]]
+	if [[ -z ${HDD} ]]
 	then
 		dialog_no_harddrive_found
 		exit 1
 	else
-		HDD=$(dialog_select_target_harddrive)
-		retval=$?
-		[[ ${retval} -eq 1 ]] && return 1
-		if [[ ${retval} -eq 0 ]]
-		then
-			dialog_setup_hdd_info
-			setup_hdd_partitions
-		fi
+		dialog_setup_hdd_info
+		setup_hdd_partitions
 	fi
 }
 
@@ -670,6 +674,7 @@
 	local method="$1"
 
 	task_hardware_detection
+	task_select_target_hdd
 
 	case "${method}" in
 		auto)