aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-11 21:46:54 -0400
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-11 21:46:54 -0400
commitdf757416b79b3aa3f83ff00bab9a7e363aa1cc41 (patch)
tree3aaa7507007841d437fad26daa4ac7e01e6c2bc2
parent76dbab939ccc87b3656e9813bfd036aa5d640aad (diff)
parente377067a6564f88d32b73b83f3316263f45fe367 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.Installer/MainWindow.xaml.cs2
-rw-r--r--MediaBrowser.Installer/MediaBrowser.Installer.csproj2
-rw-r--r--MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs2
-rw-r--r--MediaBrowser.WebDashboard/Html/support.html2
4 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index c8e1dc97c..22548a355 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -392,7 +392,7 @@ namespace MediaBrowser.Installer
/// <param name="targetExe"></param>
private void CreateUninstaller(string uninstallPath, string targetExe)
{
- using (var parent = Registry.LocalMachine.OpenSubKey(
+ using (var parent = Registry.CurrentUser.OpenSubKey(
@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true))
{
if (parent == null)
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index 819b17c50..0108f5c7c 100644
--- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj
+++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
@@ -31,7 +31,7 @@
<PublisherName>Media Browser Team</PublisherName>
<SuiteName>Media Browser</SuiteName>
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
- <ApplicationRevision>38</ApplicationRevision>
+ <ApplicationRevision>40</ApplicationRevision>
<ApplicationVersion>0.1.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>
diff --git a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
index 7b1983d53..5cbd2dd9e 100644
--- a/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
+++ b/MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs
@@ -207,7 +207,7 @@ namespace MediaBrowser.Uninstaller.Execute
private void RemoveUninstall()
{
- using (var parent = Registry.LocalMachine.OpenSubKey(
+ using (var parent = Registry.CurrentUser.OpenSubKey(
@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true))
{
if (parent == null)
diff --git a/MediaBrowser.WebDashboard/Html/support.html b/MediaBrowser.WebDashboard/Html/support.html
index 83ebc2648..44ed773f5 100644
--- a/MediaBrowser.WebDashboard/Html/support.html
+++ b/MediaBrowser.WebDashboard/Html/support.html
@@ -33,7 +33,7 @@
<p>
Finally, you can visit the Media Browser Web site to see what's happening with MB now and keep up with the developer blog.
</p>
- <a data-role="button" data-icon="home" data-iconpos="right" href="http://forum.mediabrowser3.com" target="_blank">Visit the Media Browser Web Site</a>
+ <a data-role="button" data-icon="home" data-iconpos="right" href="http://www.mediabrowser3.com" target="_blank">Visit the Media Browser Web Site</a>
</div>
</div>
</div>