Skip to content

Commit c3b4402

Browse files
committed
fix SettingFolder ctor.
1 parent 36462df commit c3b4402

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Applications/Ice/Core/Sources/SettingFolder.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,21 @@ public class SettingFolder : SettingFolder<SettingValue>
4242
/// </summary>
4343
///
4444
/* --------------------------------------------------------------------- */
45-
public SettingFolder() : this(DataContract.Format.Registry, @"CubeSoft\CubeICE\v3") { }
45+
public SettingFolder() : this(Assembly.GetCallingAssembly()) { }
4646

4747
/* --------------------------------------------------------------------- */
4848
///
49-
/// SettingFolder
49+
/// SettingsFolder
5050
///
5151
/// <summary>
5252
/// Initializes a new instance of the SettingFolder with the
53-
/// specified parameters.
53+
/// specified arguments.
5454
/// </summary>
5555
///
56-
/// <param name="format">Serialized format.</param>
57-
/// <param name="location">Location for the settings.</param>
56+
/// <param name="assembly">Source assembly.</param>
5857
///
5958
/* --------------------------------------------------------------------- */
60-
public SettingFolder(DataContract.Format format, string location) :
61-
this(typeof(SettingFolder).Assembly, format, location) { }
59+
public SettingFolder(Assembly assembly) : this(assembly, DataContract.Format.Registry, @"CubeSoft\CubeICE\v3") { }
6260

6361
/* --------------------------------------------------------------------- */
6462
///

Tests/Ice/Sources/Internal/VmFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ protected ExtractViewModel NewVM(IEnumerable<string> args, ExtractionSettingValu
125125
/* --------------------------------------------------------------------- */
126126
protected SettingFolder NewSettings()
127127
{
128-
var dest = new SettingFolder(DataContract.Format.Json, Get("Settings.json"));
128+
var dest = new SettingFolder(typeof(Program).Assembly, DataContract.Format.Json, Get("Settings.json"));
129129

130130
dest.Value.Filters = "Filter.txt|FilterDirectory|__MACOSX";
131131
dest.Value.Explorer = "dummy.exe";

0 commit comments

Comments
 (0)