WinGui:

- Fixed broken struct in the activity window that was causing memory issues.
- Few code tweaks in program.cs

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2108 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 11 insertions, 4 deletions

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index 6ab76bbae..809626df5 100644
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -22,7 +22,7 @@ namespace Handbrake
             try

             {

                 // Make sure the screen resolution is not below 1024x768

-                System.Windows.Forms.Screen scr = System.Windows.Forms.Screen.PrimaryScreen;

+                System.Windows.Forms.Screen scr = Screen.PrimaryScreen;

                 if ((scr.Bounds.Width < 1024) || (scr.Bounds.Height < 720))

                 {

                     MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n" + "Your screen is running at: " + scr.Bounds.Width.ToString() + "x" + scr.Bounds.Height.ToString() + " \nScreen resolution is too Low. Must be 1024x720 or greater", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

@@ -35,7 +35,7 @@ namespace Handbrake
             }

 

             // Either Launch or Close the Application

-            if (launch == true)

+            if (launch)

             {

                 Application.EnableVisualStyles();

                 Application.SetCompatibleTextRenderingDefault(false);

diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs
index 94597f775..5c14e4137 100644
--- a/win/C#/frmActivityWindow.cs
+++ b/win/C#/frmActivityWindow.cs
@@ -29,7 +29,7 @@ namespace Handbrake
         public frmActivityWindow(string file, Functions.Encode eh)

         {

             InitializeComponent();

-            rtf_actLog.Text = string.Empty;

+            this.rtf_actLog.Text = string.Empty;

 

             // When the window closes, we want to abort the monitor thread.

             this.Disposed += new EventHandler(forceQuit);

@@ -310,9 +310,16 @@ namespace Handbrake
         }

 

         #region System Information

-        private struct MEMORYSTATUS

+        private struct MEMORYSTATUS // Unused var's are requred here.

         {

+            public UInt32 dwLength;

+            public UInt32 dwMemoryLoad;

             public UInt32 dwTotalPhys; // Used

+            public UInt32 dwAvailPhys;

+            public UInt32 dwTotalPageFile;

+            public UInt32 dwAvailPageFile;

+            public UInt32 dwTotalVirtual;

+            public UInt32 dwAvailVirtual;

         }

 

         [DllImport("kernel32.dll")]