Skip to content

Commit 670b73b

Browse files
committed
Fixed changes to master not working
1 parent 35e56a7 commit 670b73b

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

Installer/Installer.vdproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -729,15 +729,15 @@
729729
{
730730
"Name" = "8:Microsoft Visual Studio"
731731
"ProductName" = "8:PcVolumeControl"
732-
"ProductCode" = "8:{E687DB59-16AE-489D-812B-83B37120A10D}"
733-
"PackageCode" = "8:{847EF095-CECB-4293-9BC9-3DF05C71BF0B}"
732+
"ProductCode" = "8:{A46A544A-3910-4056-BCF4-EEBE7B71A833}"
733+
"PackageCode" = "8:{12F92FD1-B53F-4326-BC85-C594899D3774}"
734734
"UpgradeCode" = "8:{C2B40E46-86B1-4406-9587-5159C50DBA6A}"
735735
"AspNetVersion" = "8:4.0.30319.0"
736736
"RestartWWWService" = "11:FALSE"
737737
"RemovePreviousVersions" = "11:TRUE"
738738
"DetectNewerInstalledVersion" = "11:TRUE"
739739
"InstallAllUsers" = "11:FALSE"
740-
"ProductVersion" = "8:1.0.1"
740+
"ProductVersion" = "8:1.0.2"
741741
"Manufacturer" = "8:Dark Rock Studios"
742742
"ARPHELPTELEPHONE" = "8:False"
743743
"ARPHELPLINK" = "8:https://github.com/PcVolumeControl"

VolumeControl/MainWindow.xaml.cs

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private void cleanUpSessionKeepers()
180180
}
181181
}
182182

183-
private void updateState(PcAudio audioUpdate)
183+
private bool updateState(PcAudio audioUpdate)
184184
{
185185
Console.WriteLine("update");
186186

@@ -222,7 +222,8 @@ private void updateState(PcAudio audioUpdate)
222222

223223
m_coreAudioController.SetDefaultDevice(newDefaultAudioDevice);
224224
m_coreAudioController.SetDefaultCommunicationsDevice(newDefaultAudioDevice);
225-
return;
225+
226+
return false;
226227
}
227228
else
228229
{
@@ -249,7 +250,7 @@ private void updateState(PcAudio audioUpdate)
249250
m_coreAudioController.DefaultPlaybackDevice.Volume = volume;
250251
}
251252

252-
return;
253+
return false;
253254
}
254255
}
255256
}
@@ -342,6 +343,8 @@ private void updateState(PcAudio audioUpdate)
342343
Console.WriteLine("Update complete!");
343344
}
344345
}
346+
347+
return true;
345348
}
346349

347350
public void onClientMessage(string message, TcpClient tcpClient)
@@ -357,9 +360,11 @@ public void onClientMessage(string message, TcpClient tcpClient)
357360

358361
if(VERSION == pcAudio.version)
359362
{
360-
updateState(pcAudio);
361-
// Update all clients to the new state
362-
dispatchAudioState();
363+
if (updateState(pcAudio))
364+
{
365+
// Update all clients to the new state
366+
dispatchAudioState();
367+
}
363368
}
364369
else
365370
{

0 commit comments

Comments
 (0)