diff --git a/NUS Downloader/Form1.cs b/NUS Downloader/Form1.cs
index d86c376..5c9ed5c 100644
--- a/NUS Downloader/Form1.cs
+++ b/NUS Downloader/Form1.cs
@@ -814,13 +814,19 @@ namespace NUS_Downloader
}
private void button3_Click(object sender, EventArgs e)
- {
- // Prevent mass deletion
- if (titleidbox.Text == String.Empty)
+ { if (titleidbox.Text == String.Empty)
{
+ // Prevent mass deletion and fail
WriteStatus("Please enter a Title ID!");
return;
}
+ else if (!(packbox.Checked) && !(decryptbox.Checked) && !(keepenccontents.Checked))
+ {
+ // Prevent pointless running by n00bs.
+ WriteStatus("Running with your current settings will produce no output!");
+ WriteStatus(" - To amend this, look below and check an output type.");
+ return;
+ }
else if (!(script_mode))
{
try
diff --git a/NUS Downloader/Properties/Resources.Designer.cs b/NUS Downloader/Properties/Resources.Designer.cs
index c5aca56..856ef57 100644
--- a/NUS Downloader/Properties/Resources.Designer.cs
+++ b/NUS Downloader/Properties/Resources.Designer.cs
@@ -60,20 +60,6 @@ namespace NUS_Downloader.Properties {
}
}
- internal static System.Drawing.Bitmap arrow_down {
- get {
- object obj = ResourceManager.GetObject("arrow_down", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- internal static System.Drawing.Bitmap arrow_up {
- get {
- object obj = ResourceManager.GetObject("arrow_up", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap box {
get {
object obj = ResourceManager.GetObject("box", resourceCulture);
@@ -88,13 +74,6 @@ namespace NUS_Downloader.Properties {
}
}
- internal static System.Drawing.Bitmap bug_error {
- get {
- object obj = ResourceManager.GetObject("bug_error", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap bullet_green {
get {
object obj = ResourceManager.GetObject("bullet_green", resourceCulture);
@@ -179,13 +158,6 @@ namespace NUS_Downloader.Properties {
}
}
- internal static System.Drawing.Bitmap help1 {
- get {
- object obj = ResourceManager.GetObject("help1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap information {
get {
object obj = ResourceManager.GetObject("information", resourceCulture);
@@ -200,13 +172,6 @@ namespace NUS_Downloader.Properties {
}
}
- internal static System.Drawing.Bitmap link {
- get {
- object obj = ResourceManager.GetObject("link", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
internal static System.Drawing.Bitmap package {
get {
object obj = ResourceManager.GetObject("package", resourceCulture);
@@ -283,12 +248,5 @@ namespace NUS_Downloader.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
-
- internal static System.Drawing.Bitmap telephone_add {
- get {
- object obj = ResourceManager.GetObject("telephone_add", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
}
}
diff --git a/NUS Downloader/Properties/Resources.resx b/NUS Downloader/Properties/Resources.resx
index f02fc74..f91080e 100644
--- a/NUS Downloader/Properties/Resources.resx
+++ b/NUS Downloader/Properties/Resources.resx
@@ -118,24 +118,15 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bullet_redorange.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\arrow_down.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\bullet_redgreen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\bug_error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -160,21 +151,12 @@
..\Resources\server_link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\server_connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\direction_down.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\box.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\help1.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
-
- ..\Resources\link.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -196,9 +178,6 @@
..\Resources\picture_empty.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\telephone_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\package_green.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -214,8 +193,11 @@
..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\drive_disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\server_connect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
\ No newline at end of file
diff --git a/NUS Downloader/WaterMarkTextBox.cs b/NUS Downloader/WaterMarkTextBox.cs
index c8f5820..fffa865 100644
--- a/NUS Downloader/WaterMarkTextBox.cs
+++ b/NUS Downloader/WaterMarkTextBox.cs
@@ -82,11 +82,12 @@ namespace wmgCMS
else
DisbaleWaterMark(); */
- if (this.Text.Length > 0)
+ /*if (this.Text.Length > 0)
{
System.Diagnostics.Debug.WriteLine(sender.ToString() + " disabled watermark");
DisbaleWaterMark();
- }
+ }*/
+ DisbaleWaterMark();
}
private void EnableWaterMark()