Skip to content

Commit 65dea3b

Browse files
committed
Merge branch '0.10-lib-rt' of https://github.com/peternewman/ola into 0.10-lib-rt
2 parents 177c88e + 397a394 commit 65dea3b

6 files changed

Lines changed: 14 additions & 6 deletions

File tree

.codespellignorewords

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
thead
21
acn
32
ACN
3+
inflight
4+
thead

.travis.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,13 @@ jobs:
349349
- lintian
350350
- moreutils
351351
allow_failures:
352+
- os: linux
353+
dist: bionic
354+
arch: arm64
355+
env: TASK='jshint'
356+
addons:
357+
apt:
358+
packages:
352359
# - os: osx
353360
# osx_image: xcode9.4
354361
# compiler: clang

common/io/TimeoutManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ TimeInterval TimeoutManager::ExecuteTimeouts(TimeStamp *now) {
9797
if (m_events.empty())
9898
return TimeInterval();
9999

100-
for (e = m_events.top(); !m_events.empty() && (e->NextTime() <= *now);
101-
e = m_events.top()) {
100+
// make sure we only try to access m_events.top() if m_events isn't empty
101+
while (!m_events.empty() && ((e = m_events.top())->NextTime() <= *now)) {
102102
m_events.pop();
103103

104104
// if this was removed, skip it

include/ola/base/FlagsPrivate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ bool Flag<T>::SetValue(const std::string &input) {
307307

308308

309309
/**
310-
* @brief This class holds all the flags, and is responsbile for parsing the
310+
* @brief This class holds all the flags, and is responsible for parsing the
311311
* command line.
312312
*/
313313
class FlagRegistry {

javascript/ola/full/dmx_console_tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ola.DmxConsoleTab.prototype.setUniverse = function(universe_id) {
6666

6767

6868
/**
69-
* Called when the tab changes visibiliy.
69+
* Called when the tab changes visibility.
7070
*/
7171
ola.DmxConsoleTab.prototype.setActive = function(state) {
7272
ola.DmxConsoleTab.superClass_.setActive.call(this, state);

javascript/ola/full/dmx_monitor_tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ goog.inherits(ola.DmxMonitorTab, ola.common.BaseUniverseTab);
3838

3939

4040
/**
41-
* Called when the tab changes visibiliy.
41+
* Called when the tab changes visibility.
4242
*/
4343
ola.DmxMonitorTab.prototype.setActive = function(state) {
4444
ola.DmxMonitorTab.superClass_.setActive.call(this, state);

0 commit comments

Comments
 (0)