SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

picout fix

Browse Source
This commit is contained in:
Пелипенко Иван
2022-04-13 22:46:53 +03:00
parent 2ab2614ab4
commit c7e67b309e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/main/core/picout.cpp
View File

@@ -160,6 +160,7 @@ PICout::PICout(int controls): fo_(true), cc_(false), fc_(false), act_(true), cnb
} }
PICout::PICout(bool active): fo_(true), cc_(false), fc_(false), act_(active), cnb_(10), co_(PICoutManipulators::DefaultControls) { PICout::PICout(bool active): fo_(true), cc_(false), fc_(false), act_(active), cnb_(10), co_(PICoutManipulators::DefaultControls) {
buffer_ = nullptr;
if (act_) if (act_)
init(); init();
} }
@@ -522,6 +523,7 @@ PICout & PICout::newLine() {
PICout & PICout::write(const char * str, int len) { PICout & PICout::write(const char * str, int len) {
if (!act_) return *this;
if (buffer_) { if (buffer_) {
buffer_->append(PIString(str, len)); buffer_->append(PIString(str, len));
} else { } else {
@@ -533,6 +535,7 @@ PICout & PICout::write(const char * str, int len) {
PICout & PICout::writePIString(const PIString & s) { PICout & PICout::writePIString(const PIString & s) {
if (!act_) return *this;
if (buffer_) { if (buffer_) {
buffer_->append(s); buffer_->append(s);
} else { } else {
@@ -555,7 +558,7 @@ void PICout::init() {
} }
attr_ = __Private__::dattr; attr_ = __Private__::dattr;
#endif #endif
buffer_ = 0; buffer_ = nullptr;
id_ = 0; id_ = 0;
if ((co_ & NoLock) != NoLock) if ((co_ & NoLock) != NoLock)
PICout::__mutex__().lock(); PICout::__mutex__().lock();

2
libs/main/core/pistring.cpp
View File

@@ -470,7 +470,7 @@ PIString & PIString::operator +=(const wchar_t * str) {
PIString & PIString::operator +=(const PIString & str) { PIString & PIString::operator +=(const PIString & str) {
*((PIDeque<PIChar>*)this) << *((PIDeque<PIChar>*)&str); PIDeque<PIChar>::append(*(const PIDeque<PIChar>*)&str);
return *this; return *this;
} }

4
libs/main/io_devices/piiodevice.cpp
View File

@@ -396,9 +396,7 @@ bool PIIODevice::close() {
} }
int PIIODevice::write(PIByteArray data) { int PIIODevice::write(PIByteArray data) {
if (isOpened()) return writeDevice(data.data(), data.size_s());
return writeDevice(data.data(), data.size_s());
return -1;
} }