Skip to content

Commit 23a1ef2

Browse files
committed
Fix Windows compile, minor usability tweaks
1 parent 0a29313 commit 23a1ef2

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

source/activation.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ void PersonalActivationDlg::OnActivateHit(wxCommandEvent&)
5757
else {
5858
auto exe = the_editor.executablePath().string();
5959
auto cmd = fmt::format("{} -batchmode -manualLicenseFile \"{}\" -logfile",exe,openFileDialog.GetPath().ToStdString());
60+
//TODO: error check this?
6061
wxExecute(cmd, wxEXEC_SYNC);
62+
wxMessageBox("Activation complete", "Activation", wxOK | wxICON_INFORMATION);
63+
this->Close();
6164
}
6265
}
6366

@@ -70,4 +73,8 @@ void PlusProActivationDlg::OnActivateHit(wxCommandEvent&)
7073
auto cmd = fmt::format("{} -batchmode -username {} -password {} -serial {} -quit",the_editor.executablePath().string(),username,password,serial);
7174

7275
wxExecute(cmd, wxEXEC_SYNC);
76+
77+
//TODO: error check this?
78+
wxMessageBox("Activation complete", "Activation", wxOK | wxICON_INFORMATION);
79+
this->Close();
7380
}

source/interface_derived.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ MainFrameDerived::MainFrameDerived() : MainFrame(NULL){
9696
this->SetLabel("Unity Hub Native " + AppVersion);
9797

9898
this->Fit();
99+
100+
projSearchCtrl->SetFocus();
99101
}
100102

101103
/**
@@ -386,7 +388,7 @@ project MainFrameDerived::LoadProject(const std::filesystem::path &p_as_fs){
386388
}
387389

388390
//the name is the final part of the path
389-
string name = p_as_fs.filename();
391+
string name = p_as_fs.filename().string();
390392

391393
//Load ProjectSettings/ProjectVersion.txt to get the editor version, if it exists
392394
std::filesystem::path projSettings = p_as_fs / "ProjectSettings" / "ProjectVersion.txt";

0 commit comments

Comments
 (0)