update
This commit is contained in:
parent
80f536bfe9
commit
962717865f
2 changed files with 3 additions and 9 deletions
|
@ -70,19 +70,12 @@ namespace Bot
|
||||||
|
|
||||||
public void Load()
|
public void Load()
|
||||||
{
|
{
|
||||||
MainConfiguration X = new MainConfiguration();
|
inst = new MainConfiguration();
|
||||||
SerialManager sm = new SerialManager();
|
SerialManager sm = new SerialManager();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
X = sm.Read<MainConfiguration>("Main");
|
inst = sm.Read<MainConfiguration>("Main");
|
||||||
|
|
||||||
MainProgramDLL = X.MainProgramDLL;
|
|
||||||
first = X.first;
|
|
||||||
last = X.last;
|
|
||||||
ActivationCode = X.ActivationCode;
|
|
||||||
password = X.password;
|
|
||||||
GitPassword = X.GitPassword;
|
|
||||||
BotAdmins = X.BotAdmins;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
catch (FileNotFoundException e)
|
catch (FileNotFoundException e)
|
||||||
|
|
|
@ -56,6 +56,7 @@ namespace Bot
|
||||||
ZHash.Instance.Key = "Test";
|
ZHash.Instance.Key = "Test";
|
||||||
Console.WriteLine("ZHash (Test): " + ZHash.Instance.Key);
|
Console.WriteLine("ZHash (Test): " + ZHash.Instance.Key);
|
||||||
conf = MainConfiguration.Instance;
|
conf = MainConfiguration.Instance;
|
||||||
|
conf.Load();
|
||||||
//MasterObjectCaches = ObjectCaches.Instance;
|
//MasterObjectCaches = ObjectCaches.Instance;
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue