3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-06 22:47:32 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed a bug that console window was created when --datadir parameter is used (#9506)

Browse source 
* attach console for Windows when command line is used

* fix version check failer in command line mode

* attach console only when we need to print help info
This commit is contained in:
SoftFever 2025-04-28 23:27:20 +08:00 • committed by GitHub
parent 84d3bd2b48
commit 9913736b41
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 43 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/OrcaSlicer.cpp
View file

@ -6032,8 +6032,51 @@ bool CLI::setup(int argc, char **argv)
return true; return true;
} }
void attach_console_on_demand(){
static bool console_attached = false;
if (!console_attached) {
// Try attaching to the parent console first
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
console_attached = true;
} else if (GetLastError() == ERROR_ACCESS_DENIED) {
// Already has a console (maybe attached by debugger)
console_attached = true;
} else {
// No parent console found, try allocating a new one
if (AllocConsole()) {
console_attached = true;
}
}
if (console_attached) {
FILE* fp = nullptr;
// Redirect standard C streams to the console
if (freopen_s(&fp, "CONOUT$", "w", stdout) == 0) {
setvbuf(stdout, NULL, _IONBF, 0); // Optional: Disable buffering
}
if (freopen_s(&fp, "CONOUT$", "w", stderr) == 0) {
setvbuf(stderr, NULL, _IONBF, 0); // Optional: Disable buffering
}
if (freopen_s(&fp, "CONIN$", "r", stdin) == 0) {
// Input redirection successful
}
// Sync C++ streams with C streams after redirection
std::ios::sync_with_stdio(true);
// Clear potential error states from C++ streams
std::cout.clear();
std::cerr.clear();
std::cin.clear();
boost::nowide::cout.clear();
boost::nowide::cerr.clear();
boost::nowide::cin.clear();
}
}
}
void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const void CLI::print_help(bool include_print_options, PrinterTechnology printer_technology) const
{ {
attach_console_on_demand();
boost::nowide::cout boost::nowide::cout
<< SLIC3R_APP_KEY <<"-"<< SoftFever_VERSION << ":" << SLIC3R_APP_KEY <<"-"<< SoftFever_VERSION << ":"
<< std::endl << std::endl
@ -6298,46 +6341,6 @@ extern "C" {
int *a = nullptr; int *a = nullptr;
*a = 0; *a = 0;
}); });
bool cli_mode = argc > 1; // Simple check for CLI mode
bool console_attached = false;
if (cli_mode) {
// Try attaching to the parent console first
if (AttachConsole(ATTACH_PARENT_PROCESS)) {
console_attached = true;
} else if (GetLastError() == ERROR_ACCESS_DENIED) {
// Already has a console (maybe attached by debugger)
console_attached = true;
} else {
// No parent console found, try allocating a new one
if (AllocConsole()) {
console_attached = true;
}
}
if (console_attached) {
FILE* fp = nullptr;
// Redirect standard C streams to the console
if (freopen_s(&fp, "CONOUT$", "w", stdout) == 0) {
setvbuf(stdout, NULL, _IONBF, 0); // Optional: Disable buffering
}
if (freopen_s(&fp, "CONOUT$", "w", stderr) == 0) {
setvbuf(stderr, NULL, _IONBF, 0); // Optional: Disable buffering
}
if (freopen_s(&fp, "CONIN$", "r", stdin) == 0) {
// Input redirection successful
}
// Sync C++ streams with C streams after redirection
std::ios::sync_with_stdio(true);
// Clear potential error states from C++ streams
std::cout.clear();
std::cerr.clear();
std::cin.clear();
boost::nowide::cout.clear();
boost::nowide::cerr.clear();
boost::nowide::cin.clear();
}
}
// Call the UTF8 main. // Call the UTF8 main.
return CLI().run(argc, argv_ptrs.data()); return CLI().run(argc, argv_ptrs.data());
} }