2
0
Эх сурвалжийг харах

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

LukePulverenti 12 жил өмнө
parent
commit
df757416b7

+ 1 - 1
MediaBrowser.Installer/MainWindow.xaml.cs

@@ -392,7 +392,7 @@ namespace MediaBrowser.Installer
         /// <param name="targetExe"></param>
         /// <param name="targetExe"></param>
         private void CreateUninstaller(string uninstallPath, string targetExe)
         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))
                          @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true))
             {
             {
                 if (parent == null)
                 if (parent == null)

+ 1 - 1
MediaBrowser.Installer/MediaBrowser.Installer.csproj

@@ -31,7 +31,7 @@
     <PublisherName>Media Browser Team</PublisherName>
     <PublisherName>Media Browser Team</PublisherName>
     <SuiteName>Media Browser</SuiteName>
     <SuiteName>Media Browser</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>38</ApplicationRevision>
+    <ApplicationRevision>40</ApplicationRevision>
     <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <PublishWizardCompleted>true</PublishWizardCompleted>

+ 1 - 1
MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs

@@ -207,7 +207,7 @@ namespace MediaBrowser.Uninstaller.Execute
         private void RemoveUninstall()
         private void RemoveUninstall()
         {
         {
 
 
-            using (var parent = Registry.LocalMachine.OpenSubKey(
+            using (var parent = Registry.CurrentUser.OpenSubKey(
                 @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true))
                 @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", true))
             {
             {
                 if (parent == null)
                 if (parent == null)

+ 1 - 1
MediaBrowser.WebDashboard/Html/support.html

@@ -33,7 +33,7 @@
                     <p>
                     <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.
                         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>
                     </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>
             </div>
         </div>
         </div>