Skip to content

fix a crash hapenning since updating Ubuntu 18.04 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markdstjohn merged 2 commits into from
May 12, 2020
Merged

fix a crash hapenning since updating Ubuntu 18.04 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77921c8
minor fixes to make Easystroke compile on Ubuntu 18.04
dkondor Sep 22, 2018
140b9ca
fixed recurring crash when trying to render 0x0 tray icon
dkondor Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion actions.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ void TreeViewMulti::on_drag_begin(const Glib::RefPtr<Gdk::DragContext> &context)
bool negate(bool b) { return !b; }

TreeViewMulti::TreeViewMulti() : Gtk::TreeView(), pending(false) {
get_selection()->set_select_function(sigc::group(&negate, sigc::ref(pending)));
get_selection()->set_select_function(
[this](Glib::RefPtr<Gtk::TreeModel> const&, Gtk::TreeModel::Path const&, bool) {
return !pending;
});
}

enum Type { COMMAND, KEY, TEXT, SCROLL, IGNORE, BUTTON, MISC };
Expand Down
2 changes: 1 addition & 1 deletion handler.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ class WaitForPongHandler : public Handler, protected Timeout {
virtual Grabber::State grab_mode() { return parent->grab_mode(); }
};

static inline float abs(float x) { return x > 0 ? x : -x; }
/* static inline float abs(float x) { return x > 0 ? x : -x; } */

class AbstractScrollHandler : public Handler {
bool have_x, have_y;
Expand Down
2 changes: 1 addition & 1 deletion win.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ void Win::timeout() {
}

void Win::set_icon(RStroke stroke, bool invert) {
if (!icon)
if (!icon || icon->get_size() <= 0)
return;
icon->set(stroke->draw(icon->get_size(), 2.0, invert));
set_timeout(10000);
Expand Down