stubbfel/win8phoneApp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/#290

Browse Source
This commit is contained in:
Christian Fiedler
2013-11-26 16:22:11 +01:00
parent 11016d033f 0ebe01dfe6
commit a1256ff18e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CampusAppWP8/CampusAppWP8/Model/Setting/MensaSetting.cs
View File

@@ -47,7 +47,10 @@ using CampusAppWPortalLib8.Model.Settings;
}
}
/// <summary> Gets or sets the selected mensa. </summary>
/// <summary>
/// Gets or sets the selected mensa. That means if the Campus is UserSettingCampus then
/// return the Campus from user profil.
/// </summary>
/// <value> The selected mensa. </value>
public Campus SelectedMensa
{

6
CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
View File

@@ -190,7 +190,7 @@ namespace CampusAppWP8.Pages.Mensa
{
if (mensaCampus == Campus.UserSettingCampus)
{
this.InitializeFeed(Settings.UserProfil.DefaultCampus);
this.InitializeFeed(Settings.AppSetting.FunctionSettings.MensaSetting.SelectedMensa);
}
else
{
@@ -231,14 +231,14 @@ namespace CampusAppWP8.Pages.Mensa
/// <remarks> Stubbfel, 15.10.2013. </remarks>
private void InitializeFeed()
{
if (Settings.AppSetting.LocatingSetting.GeoWatchEnable)
if (Settings.AppSetting.LocatingSetting.GeoWatchEnable && Settings.AppSetting.FunctionSettings.MensaSetting.AtomMensaSelection)
{
Thread thread = new Thread(new ThreadStart(this.DeterminCurrentCampusAndLoadFeed));
thread.Start();
}
else
{
this.InitializeFeed(Settings.UserProfil.DefaultCampus);
this.InitializeFeed(Settings.AppSetting.FunctionSettings.MensaSetting.SelectedMensa);
}
}