Skip to content

Commit 66a429a

Browse files
committed
Fix again.
1 parent 1abdc14 commit 66a429a

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

ClientSource/Connection/BotBase.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,7 @@ BotBaseContext::BotBaseContext(CancellableScope& parent, BotBaseContext& context
2828
attach(parent);
2929
}
3030
BotBaseContext::~BotBaseContext(){
31-
m_lifetime_sanitizer.check_usage();
3231
detach();
33-
try{
34-
m_botbase.wait_for_all_requests(this);
35-
}catch (...){
36-
// cout << "canceled with exception: " << this << endl;
37-
CancellableScope* parent = scope();
38-
if (parent){
39-
parent->cancel(std::current_exception());
40-
}
41-
}
4232
}
4333

4434
void BotBaseContext::wait_for_all_requests() const{

SerialPrograms/Source/CommonFramework/Globals.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace PokemonAutomation{
2222
// misleading version information.
2323
//
2424

25-
const bool IS_BETA_VERSION = true;
25+
const bool IS_BETA_VERSION = false;
2626
const int PROGRAM_VERSION_MAJOR = 0;
2727
const int PROGRAM_VERSION_MINOR = 50;
2828
const int PROGRAM_VERSION_PATCH = 18;

SerialPrograms/Source/CommonFramework/InferenceInfra/InferenceRoutines.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ int run_until(
7878
stream, context,
7979
[&](CancellableScope& scope){
8080
ContextType subcontext(scope, context);
81-
command(subcontext);
81+
if (command){
82+
command(subcontext);
83+
}
84+
subcontext.wait_for_all_requests();
8285
},
8386
callbacks,
8487
default_video_period,

0 commit comments

Comments
 (0)