aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukePulverenti <luke.pulverenti@gmail.com>2013-03-13 14:36:40 -0400
committerLukePulverenti <luke.pulverenti@gmail.com>2013-03-13 14:36:40 -0400
commit3303f30f8ab751234b8c85ad1915f53d6ae64a14 (patch)
tree444070ec0a3aa231249e2635a77ddfc686eba783
parente7500d586c0fa3436cd996071e449b2fa174c7eb (diff)
parent1e0a405ef39cc45654b4882546f22d27630399a3 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
-rw-r--r--MediaBrowser.Installer/MainWindow.xaml.cs3
-rw-r--r--MediaBrowser.Installer/MediaBrowser.Installer.csproj2
2 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Installer/MainWindow.xaml.cs b/MediaBrowser.Installer/MainWindow.xaml.cs
index a48ce85d1..2a905293c 100644
--- a/MediaBrowser.Installer/MainWindow.xaml.cs
+++ b/MediaBrowser.Installer/MainWindow.xaml.cs
@@ -240,6 +240,7 @@ namespace MediaBrowser.Installer
}
// Create shortcut
+ lblStatus.Text = "Creating Shortcuts...";
var fullPath = Path.Combine(RootPath, "System", TargetExe);
try
{
@@ -254,6 +255,7 @@ namespace MediaBrowser.Installer
// Install Pismo
if (InstallPismo)
{
+ lblStatus.Text = "Installing ISO Support...";
try
{
PismoInstall();
@@ -269,6 +271,7 @@ namespace MediaBrowser.Installer
Directory.Delete(Path.Combine(RootPath, "Pismo"), true);
// And run
+ lblStatus.Text = string.Format("Starting {0}...", FriendlyName);
try
{
Process.Start(fullPath);
diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj
index a43270d1c..3293aab5a 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>44</ApplicationRevision>
+ <ApplicationRevision>46</ApplicationRevision>
<ApplicationVersion>0.1.1.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted>