WinGui:

- Fixed Tools>Options would not remember settings on Windows Vista
- Fixed "Set current options as program defaults" not saving current settings on vista.

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

5 files changed, 33 insertions, 4 deletions

diff --git a/win/Handbrake.sln b/win/Handbrake.sln
index 91d1d3047..055c019a9 100644
--- a/win/Handbrake.sln
+++ b/win/Handbrake.sln
@@ -1,18 +1,28 @@
 

 Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Basic Express 2005

+# Visual Studio 2005

 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Handbrake", "Handbrake\Handbrake.vbproj", "{90340A3E-52AC-4396-8199-7047229DCC75}"

+	ProjectSection(WebsiteProperties) = preProject

+		Debug.AspNetCompiler.Debug = "True"

+		Release.AspNetCompiler.Debug = "False"

+	EndProjectSection

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Any CPU = Debug|Any CPU

+		Debug|x86 = Debug|x86

 		Release|Any CPU = Release|Any CPU

+		Release|x86 = Release|x86

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

 		{90340A3E-52AC-4396-8199-7047229DCC75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{90340A3E-52AC-4396-8199-7047229DCC75}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{90340A3E-52AC-4396-8199-7047229DCC75}.Debug|x86.ActiveCfg = Debug|x86

+		{90340A3E-52AC-4396-8199-7047229DCC75}.Debug|x86.Build.0 = Debug|x86

 		{90340A3E-52AC-4396-8199-7047229DCC75}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{90340A3E-52AC-4396-8199-7047229DCC75}.Release|Any CPU.Build.0 = Release|Any CPU

+		{90340A3E-52AC-4396-8199-7047229DCC75}.Release|x86.ActiveCfg = Release|x86

+		{90340A3E-52AC-4396-8199-7047229DCC75}.Release|x86.Build.0 = Release|x86

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/win/Handbrake.suo b/win/Handbrake.suo
index 1d2a79685..260fc1213 100644
--- a/win/Handbrake.suo
+++ b/win/Handbrake.suo
diff --git a/win/Handbrake/Handbrake.vbproj b/win/Handbrake/Handbrake.vbproj
index 4b2adfe9a..9607cab54 100644
--- a/win/Handbrake/Handbrake.vbproj
+++ b/win/Handbrake/Handbrake.vbproj
@@ -44,6 +44,25 @@
     <DocumentationFile>Handbrake.xml</DocumentationFile>

     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>

   </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DefineDebug>true</DefineDebug>

+    <DefineTrace>true</DefineTrace>

+    <OutputPath>bin\x86\Debug\</OutputPath>

+    <DocumentationFile>Handbrake.xml</DocumentationFile>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>

+    <DebugType>full</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

+    <DefineTrace>true</DefineTrace>

+    <OutputPath>bin\x86\Release\</OutputPath>

+    <DocumentationFile>Handbrake.xml</DocumentationFile>

+    <Optimize>true</Optimize>

+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>

+    <DebugType>pdbonly</DebugType>

+    <PlatformTarget>x86</PlatformTarget>

+  </PropertyGroup>

   <ItemGroup>

     <Reference Include="System" />

     <Reference Include="System.Data" />

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index ca2af6c66..12ee4f779 100644
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -10,7 +10,6 @@ Public Class frmMain
 

 

     Private Sub frmMain_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load

-

         '# Sets the Version in the bottom corner of the screen.

         Version.Text = System.String.Format(Version.Text, My.Application.Info.Version.Major, My.Application.Info.Version.Minor)

 

@@ -304,7 +303,7 @@ Public Class frmMain
         'H264 Tab

         My.Settings.CRF = CheckCRF.CheckState

         My.Settings.H264 = rtf_h264advanced.Text

-

+        My.Settings.Save()

     End Sub

 

     Private Sub mnu_viewDVDdata_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mnu_viewDVDdata.Click

diff --git a/win/Handbrake/frmOptions.vb b/win/Handbrake/frmOptions.vb
index 8441db731..23294e230 100644
--- a/win/Handbrake/frmOptions.vb
+++ b/win/Handbrake/frmOptions.vb
@@ -3,6 +3,7 @@ Imports System.IO
 Public Class frmOptions

 

     Private Sub btn_close_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_close.Click

+        My.Settings.Save()

         Me.Close()

     End Sub

 

@@ -72,7 +73,7 @@ Public Class frmOptions
         End If

     End Sub

 

-   

+

     Private Sub check_readDVDWindow_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles check_readDVDWindow.CheckedChanged

         If check_readDVDWindow.CheckState = 1 Then

             Try